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/

49 files changed, 126872 insertions, 121915 deletions

diff --git a/tde-i18n-ar/messages/tdesdk/umbrello.po b/tde-i18n-ar/messages/tdesdk/umbrello.po
index c7dd867b75a..ef0c7fcd1a0 100644
--- a/tde-i18n-ar/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ar/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-12-21 21:32+0100\n"
 "Last-Translator: محمد سعد  Mohamed SAAD <metehyi@free.fr>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -14,252 +14,220 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello المؤلفون"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "ملف لفتحه"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 #, fuzzy
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "بول Umbrello المؤلفون"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "أحمد محمد زواوي"
 
-#: docgenerators/main.cpp:67 main.cpp:98
+#: _translatorinfo:2
 #, fuzzy
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello المؤلفون"
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "azawawi@emirates.net.ae"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
 #, fuzzy
-msgid "Exporting all views..."
-msgstr "تصدير صورة."
+msgid "Enter Activity Name"
+msgstr "أدخل النّشاط الاسم"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: 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/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, fuzzy, c-format
-msgid "There was a problem saving file: %1"
-msgstr "هناك أ 1"
-
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-#, fuzzy
-msgid "Save Error"
-msgstr "خطأ في الحفظ"
-
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "الكائن"
-
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "رسالة متزامنة "
-
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "رسالة غير متزامنة"
-
-#: association.cpp:87 worktoolbar.cpp:248
-#, fuzzy
-msgid "Association"
-msgstr "الجمعيّة"
-
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
 msgstr ""
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "المرساة"
-
-#: worktoolbar.cpp:251
-msgid "Label"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
 msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "الملاحظة"
-
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "الصندوق"
-
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "الممثّل"
-
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
 msgstr ""
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
 msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: worktoolbar.cpp:258
-msgid "Directional Association"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
 msgstr ""
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 msgstr ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
 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 "الفئة"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "التنسيق"
 
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
 msgstr ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr ""
+#: association.cpp:84
+#, fuzzy
+msgid "Generalization"
+msgstr "التعميم"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
 msgstr ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "الرزمة"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "المكون"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#: association.cpp:87 worktoolbar.cpp:248
 #, fuzzy
-msgid "Node"
-msgstr "العقدة"
-
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr ""
+msgid "Association"
+msgstr "الجمعيّة"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "الواجهة"
+#: association.cpp:88
+#, fuzzy
+msgid "Self Association"
+msgstr "ذاته الجمعيّة"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr ""
+#: association.cpp:89
+#, fuzzy
+msgid "Collaboration Message"
+msgstr "التّعاون"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr ""
+#: association.cpp:90
+#, fuzzy
+msgid "Sequence Message"
+msgstr "السلسلة التخطيط"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr ""
+#: association.cpp:91
+#, fuzzy
+msgid "Collaboration Self Message"
+msgstr "التّعاون التخطيط"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
 msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
 msgstr ""
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr ""
+#: association.cpp:95
+#, fuzzy
+msgid "Realization"
+msgstr "الإدراك"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
+#: association.cpp:96
+#, fuzzy
+msgid "Uni Association"
+msgstr "البادئة التي تعني واحد او مرّة واحدة الجمعيّة"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "المرساة"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr ""
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr ""
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "النّشاط"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "الحالة"
+#: associationwidget.cpp:2328
+#, fuzzy
+msgid "Multiplicity"
+msgstr "التعدّد"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr ""
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+#, fuzzy
+msgid "Enter multiplicity:"
+msgstr "أدخل:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr ""
+#: associationwidget.cpp:2346
+#, fuzzy
+msgid "Association Name"
+msgstr "الجمعيّة الاسم"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "الرسالة"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+#, fuzzy
+msgid "Enter association name:"
+msgstr "أدخل اسم:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr ""
+#: associationwidget.cpp:2366
+#, fuzzy
+msgid "Role Name"
+msgstr "الدور الاسم"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr ""
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+#, fuzzy
+msgid "Enter role name:"
+msgstr "أدخل اسم:"
+
+#: classifier.cpp:201
+#, fuzzy
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr "أداة تعريف مع بوصة ل"
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+#, fuzzy
+msgid "That is an invalid name."
+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
+#, fuzzy
+msgid "Invalid Name"
+msgstr "اسم غير صالح"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+#, fuzzy
+msgid "That name is already being used."
+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
+#, fuzzy
+msgid "Not a Unique Name"
+msgstr "لا أ وحيدفريد الاسم"
 
 #: clipboard/umlclipboard.cpp:687
 #, fuzzy
 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."
+"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 "عند من عناصر بوصة ليس عنصر من اسم الكل غير ذلك عناصر."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -281,8 +249,7 @@ msgstr "لا يستطيع فتح ملف"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
 #, fuzzy
-msgid ""
-"Cannot create the folder:\n"
+msgid "Cannot create the folder:\n"
 msgstr "لا يستطيع ل"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
@@ -296,1335 +263,1718 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "لا يستطيع إنشاء المجلد"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#: codegenerators/cppcodegenerationform.cpp:36
 #, fuzzy
-msgid "Enter State Name"
-msgstr "أدخل الحالة الاسم"
+msgid "General Options"
+msgstr "الإعدادات العامة"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+#: codegenerators/cppcodegenerationform.cpp:38
 #, fuzzy
-msgid "Enter the name of the new state:"
-msgstr "أدخل اسم من جديد:"
+msgid "Package is a namespace"
+msgstr "حزمة أ"
 
-#: statewidget.cpp:176
+#: codegenerators/cppcodegenerationform.cpp:41
 #, fuzzy
-msgid "Enter Activity"
-msgstr "أدخل النّشاط"
+msgid "Virtual destructors"
+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:"
+#: codegenerators/cppcodegenerationform.cpp:44
+#, fuzzy
+msgid "Generate empty constructors"
+msgstr "توليد فارغ"
+
+#: codegenerators/cppcodegenerationform.cpp:47
+#, fuzzy
+msgid "Generate accessor methods"
+msgstr "توليد"
+
+#: codegenerators/cppcodegenerationform.cpp:50
+#, fuzzy
+msgid "Operations are inline"
+msgstr "عمليةالمكان:العمليات الحسابيةالعمليات"
+
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
+
+#: 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
 #, fuzzy
-msgid "UML Model"
-msgstr "Umbrello"
+msgid "Ready."
+msgstr "جاهز."
 
-#: umldoc.cpp:106
+#: 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 "Logical View"
-msgstr "منطقيّ عرض"
+msgid "Namespace"
+msgstr "جديد"
 
-#: umldoc.cpp:107
+#: 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 "الفئة"
+
+#: codeimport/kdevcppparser/errors.cpp:23
 #, fuzzy
-msgid "Use Case View"
-msgstr "استعمل الحالة عرض"
+msgid "Internal Error"
+msgstr "لصق خطأ"
 
-#: umldoc.cpp:108
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
 #, fuzzy
-msgid "Component View"
-msgstr "المكون عرض"
+msgid "} expected"
+msgstr "مُنتقى:"
 
-#: umldoc.cpp:109
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:688
 #, fuzzy
-msgid "Deployment View"
-msgstr "الإنتشار عرض"
+msgid "{ expected"
+msgstr "مُنتقى:"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: umldoc.cpp:229
+#: codeimport/kdevcppparser/parser.cpp:938
 #, fuzzy
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+msgid "expected a declaration"
+msgstr "اختيار العملية"
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 msgstr ""
-"تم تعديل الملف الحالي،\n"
-"هل تريد حفظه؟"
 
-#: umldoc.cpp:355
-#, fuzzy
-msgid "The file %1 does not exist."
-msgstr "الـ ليس."
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
 
-#: 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
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2235
 #, fuzzy
-msgid "Load Error"
-msgstr "تحميل خطأ"
+msgid "Base class specifier expected"
+msgstr "الأساس المصنّفون"
 
-#: umldoc.cpp:380
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2374
 #, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "الـ ليس."
+msgid "Class name expected"
+msgstr "الأصناف مختار"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: 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:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "هناك أ 1"
+#: 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:472 umldoc.cpp:488
-#, fuzzy, c-format
-msgid "There was a problem loading file: %1"
-msgstr "هناك أ 1"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
 
-#: umldoc.cpp:641
-#, fuzzy, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "هناك أ 1"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: umldoc.cpp:934
+#: 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 "use case diagram"
-msgstr "الاستعمل"
+msgid "Properties"
+msgstr "&خصائص"
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "النشاط الأول"
+
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: 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
+#, fuzzy, no-c-format
+msgid "General"
+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 "الخصائص العامة"
+
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: umldoc.cpp:946
+#: 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 "التوثيق"
+
+#: 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 "component diagram"
-msgstr "المكون"
+msgid "Font"
+msgstr "الخط:"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: 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 ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: 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 "اللون"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
 msgstr ""
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "الأنشطة"
+
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr ""
+
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid "Name"
-msgstr "الاسم"
+msgid "Delete"
+msgstr "حذف المرساة"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "إعادة تسمية"
+
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr ""
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr ""
+
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "Enter name:"
-msgstr "أدخل اسم:"
+msgid "Rename Activity"
+msgstr "إعادة تسمية النّشاط"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr ""
+
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, fuzzy, no-c-format
+msgid "Name:"
+msgstr "الاسم:"
+
+#: dialogs/assocgenpage.cpp:80
 #, fuzzy
-msgid "That is an invalid name for a diagram."
-msgstr "ذلك غير صالح اسم لـ أ."
+msgid "Type:"
+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
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
 #, fuzzy
-msgid "Invalid Name"
-msgstr "اسم غير صالح"
+msgid "Associations"
+msgstr "الجمعيّات"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
+#: dialogs/assocpropdlg.cpp:39
 #, fuzzy
-msgid "A diagram is already using that name."
-msgstr "A اسم."
+msgid "Association Properties"
+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
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
 #, fuzzy
-msgid "Not a Unique Name"
-msgstr "لا أ وحيدفريد الاسم"
+msgid "General Settings"
+msgstr "الإعدادات العامة"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "That is an invalid name."
-msgstr "ذلك غير صالح اسم."
+msgid "Roles"
+msgstr "الأدوار"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "That name is already being used."
-msgstr "ذلك اسم."
+msgid "Role Settings"
+msgstr "الدور إعدادات"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
+#: dialogs/assocpropdlg.cpp:112
 #, fuzzy
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr "الـ اسم ليس وحيد?"
+msgid "Association font"
+msgstr "الجمعيّة الخط"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
+#: dialogs/assocrolepage.cpp:50
 #, fuzzy
-msgid "Name Not Unique"
-msgstr "الاسم لا وحيدفريد"
+msgid "Role A Properties"
+msgstr "الدور A خصائص"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/assocrolepage.cpp:51
 #, fuzzy
-msgid "Use Name"
-msgstr "استعمل الحالة"
+msgid "Role B Properties"
+msgstr "الدور B خصائص"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/assocrolepage.cpp:68
 #, fuzzy
-msgid "Enter New Name"
-msgstr "أدخل الحالة الاسم"
+msgid "Role A Visibility"
+msgstr "الدور A الرؤية"
 
-#: umldoc.cpp:1099
+#: dialogs/assocrolepage.cpp:69
 #, fuzzy
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "هل إلى حذف?"
+msgid "Role B Visibility"
+msgstr "الدور B الرؤية"
 
-#: umldoc.cpp:1099
+#: dialogs/assocrolepage.cpp:70
 #, fuzzy
-msgid "Delete Diagram"
-msgstr "حذف التخطيط"
+msgid "Role A Changeability"
+msgstr "الدور A التغير"
 
-#: umldoc.cpp:1573
+#: dialogs/assocrolepage.cpp:71
 #, fuzzy
-msgid "Setting up the document..."
-msgstr "الضبط إلى أعلى."
+msgid "Role B Changeability"
+msgstr "الدور B التغير"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: umldoc.cpp:1638
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, fuzzy, no-c-format
+msgid "Multiplicity:"
+msgstr "التعدّد:"
+
+#: 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
+#, fuzzy, no-c-format
+msgid "Public"
+msgstr "عام"
+
+#: 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
+#, fuzzy, no-c-format
+msgid "Private"
+msgstr "خاص"
+
+#: 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
+#, fuzzy, no-c-format
+msgid "Protected"
+msgstr "محمي"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "التطبيق"
+
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, fuzzy, no-c-format
+msgid "Changeable"
+msgstr "متغير"
+
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, fuzzy, no-c-format
+msgid "Frozen"
+msgstr "مجمّد"
+
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, fuzzy, no-c-format
+msgid "Add only"
+msgstr "إضافة"
+
+#: dialogs/classgenpage.cpp:50
 #, fuzzy
-msgid "Loading UML elements..."
-msgstr "التحميل."
+msgid "Class &name:"
+msgstr "الفئة اسم:"
 
-#: umldoc.cpp:1811
+#: dialogs/classgenpage.cpp:52
 #, fuzzy
-msgid "Loading diagrams..."
-msgstr "التحميل."
+msgid "Actor &name:"
+msgstr "الممثّل اسم:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#: dialogs/classgenpage.cpp:54
 #, fuzzy
-msgid "kde-uml-Diagram"
-msgstr "التخطيط"
+msgid "Package &name:"
+msgstr "حزمة اسم:"
 
-#: umldoc.cpp:2104
-#, fuzzy, c-format
-msgid "/autosave%1"
-msgstr "1"
+#: dialogs/classgenpage.cpp:56
+#, fuzzy
+msgid "Use case &name:"
+msgstr "استعمل اسم:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/classgenpage.cpp:58
+#, fuzzy
+msgid "Interface &name:"
+msgstr "الواجهة اسم:"
 
-#: umllistview.cpp:416
+#: dialogs/classgenpage.cpp:60
 #, fuzzy
-msgid "Enter Model Name"
-msgstr "أدخل الحالة الاسم"
+msgid "Component &name:"
+msgstr "المكون اسم:"
 
-#: umllistview.cpp:417
+#: dialogs/classgenpage.cpp:62
 #, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "أدخل جديد اسم من:"
+msgid "Artifact &name:"
+msgstr "الأداة اسم:"
 
-#: umllistview.cpp:1007
+#: dialogs/classgenpage.cpp:64
 #, fuzzy
-msgid "Views"
-msgstr "المشاهد"
+msgid "Enum &name:"
+msgstr "اسم:"
 
-#: umllistview.cpp:1906
+#: dialogs/classgenpage.cpp:66
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr "الـ اسم غير صالح."
+msgid "Datatype &name:"
+msgstr "اسم:"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
+#: dialogs/classgenpage.cpp:68
 #, fuzzy
-msgid "Name Not Valid"
-msgstr "الاسم لا صالح"
+msgid "Entity &name:"
+msgstr "اسم:"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
 #, fuzzy
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr "الـ اسم ليس وحيد."
+msgid "&Stereotype name:"
+msgstr "القالب الجاهز اسم:"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/classgenpage.cpp:107
+#, fuzzy
+msgid "&Package name:"
+msgstr "حزمة اسم:"
 
-#: umllistview.cpp:2338
+#: dialogs/classgenpage.cpp:121
 #, fuzzy
-msgid "Loading listview..."
-msgstr "التحميل."
+msgid "A&bstract class"
+msgstr "ملخص"
 
-#: umllistview.cpp:2670
+#: dialogs/classgenpage.cpp:123
 #, fuzzy
-msgid "The folder must be emptied before it can be deleted."
-msgstr "الـ محذوف."
+msgid "A&bstract use case"
+msgstr "ملخص"
 
-#: umllistview.cpp:2671
+#: dialogs/classgenpage.cpp:131
 #, fuzzy
-msgid "Folder Not Empty"
-msgstr "المجلد لا فارغ"
+msgid "&Executable"
+msgstr "قابل للتّنفيذ"
 
-#: classifier.cpp:201
+#: dialogs/classgenpage.cpp:138
+#, fuzzy
+msgid "Draw As"
+msgstr "رسم ك"
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+#, fuzzy
+msgid "&Default"
+msgstr "ا&فتراضي"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "ملأ:"
+
+#: dialogs/classgenpage.cpp:149
+#, fuzzy
+msgid "&Library"
+msgstr "مكتبة"
+
+#: dialogs/classgenpage.cpp:152
+#, fuzzy
+msgid "&Table"
+msgstr "&جدول"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+#, fuzzy
+msgid "Visibility"
+msgstr "الرؤية"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+#, fuzzy
+msgid "P&ublic"
+msgstr "عام"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+#, fuzzy
+msgid "P&rivate"
+msgstr "خاص"
+
+#: dialogs/classgenpage.cpp:182
+#, fuzzy
+msgid "Pro&tected"
+msgstr "محمي"
+
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "التطبيق"
+
+#: dialogs/classgenpage.cpp:256
+#, fuzzy
+msgid "Class name:"
+msgstr "اسم الفئة:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#, fuzzy
+msgid "Instance name:"
+msgstr "برهة اسم:"
+
+#: dialogs/classgenpage.cpp:272
+#, fuzzy
+msgid "Draw as actor"
+msgstr "رسم"
+
+#: dialogs/classgenpage.cpp:277
+#, fuzzy
+msgid "Multiple instance"
+msgstr "متعدد"
+
+#: dialogs/classgenpage.cpp:284
+#, fuzzy
+msgid "Show destruction"
+msgstr "إظهار"
+
+#: dialogs/classgenpage.cpp:322
+#, fuzzy
+msgid "Component name:"
+msgstr "المكون اسم:"
+
+#: dialogs/classgenpage.cpp:324
+#, fuzzy
+msgid "Node name:"
+msgstr "العقدة اسم:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+#, fuzzy
+msgid "Stereotype name:"
+msgstr "القالب الجاهز اسم:"
+
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 #, fuzzy
 msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "أداة تعريف مع بوصة ل"
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
+msgstr "الـ اسم اسم إعادة الضبط."
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
 #, fuzzy
-msgid "Enter Activity Name"
-msgstr "أدخل النّشاط الاسم"
+msgid "Name is Not Unique"
+msgstr "الاسم لا وحيدفريد"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
 #, fuzzy
-msgid "new state"
-msgstr "جديد"
+msgid "Attributes"
+msgstr "خواص"
 
-#: association.cpp:84
+#: dialogs/classifierlistpage.cpp:39
 #, fuzzy
-msgid "Generalization"
-msgstr "التعميم"
+msgid "N&ew Attribute..."
+msgstr "جديد صفة."
 
-#: association.cpp:88
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
 #, fuzzy
-msgid "Self Association"
-msgstr "ذاته الجمعيّة"
+msgid "Operations"
+msgstr "عمليةالمكان:العمليات الحسابيةالعمليات"
 
-#: association.cpp:89
+#: dialogs/classifierlistpage.cpp:42
 #, fuzzy
-msgid "Collaboration Message"
-msgstr "التّعاون"
+msgid "N&ew Operation..."
+msgstr "جديد العملية."
 
-#: association.cpp:90
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
 #, fuzzy
-msgid "Sequence Message"
-msgstr "السلسلة التخطيط"
+msgid "Templates"
+msgstr "قوالب"
 
-#: association.cpp:91
+#: dialogs/classifierlistpage.cpp:45
 #, fuzzy
-msgid "Collaboration Self Message"
-msgstr "التّعاون التخطيط"
+msgid "N&ew Template..."
+msgstr "جديد T&emplate."
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals"
+msgstr "الأخطاء المطبعيّة"
 
-#: association.cpp:95
+#: dialogs/classifierlistpage.cpp:48
 #, fuzzy
-msgid "Realization"
-msgstr "الإدراك"
+msgid "N&ew Enum Literal..."
+msgstr "جديد حرفي."
 
-#: association.cpp:96
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
 #, fuzzy
-msgid "Uni Association"
-msgstr "البادئة التي تعني واحد او مرّة واحدة الجمعيّة"
+msgid "Entity Attributes"
+msgstr "خواص"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "جديد صفة."
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "&Diagram"
-msgstr "التخطيط"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "حذف المرساة"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, fuzzy, no-c-format
-msgid "&New"
-msgstr "&جديد"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+#, fuzzy
+msgid "&Properties"
+msgstr "&خصائص"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, fuzzy, no-c-format
-msgid "Sh&ow"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+#, fuzzy
+msgid "Show"
 msgstr "إظهار"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "&Code"
-msgstr "كود"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+#, fuzzy
+msgid "Operatio&ns"
+msgstr "عمليةالمكان:العمليات الحسابيةالعمليات"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Active &Language"
-msgstr "نشط اللغة"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+#, fuzzy
+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 "التوثيق"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+#, fuzzy
+msgid "O&peration signature"
+msgstr "العملية"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, fuzzy, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "شَّرطة شَّرطة"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+#, fuzzy
+msgid "Pac&kage"
+msgstr "حزمة"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "شَّرطة نجم"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+#, fuzzy
+msgid "Att&ributes"
+msgstr "خواص"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, fuzzy, no-c-format
-msgid "Style:"
-msgstr "الأسلوب:"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+#, fuzzy
+msgid "Stereot&ype"
+msgstr "القالب الجاهز"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\"> C كود الجيل</p>"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+#, fuzzy
+msgid "Attr&ibute signature"
+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
-#, fuzzy, no-c-format
-msgid "General"
-msgstr "عام"
+#: dialogs/classoptionspage.cpp:108
+#, fuzzy
+msgid "Draw as circle"
+msgstr "رسم"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Method Body Generation"
-msgstr "منهج الجسم الجيل"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Display"
+msgstr "عرض"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "استعمل لـ بوصة:"
+#: dialogs/classpropdlg.cpp:118
+#, fuzzy
+msgid "Display Options"
+msgstr "اختيارات العرض"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr ""
+#: dialogs/classpropdlg.cpp:179
+#, fuzzy
+msgid "Attribute Settings"
+msgstr "صفة إعدادات"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr ""
+#: dialogs/classpropdlg.cpp:187
+#, fuzzy
+msgid "Operation Settings"
+msgstr "العملية إعدادات"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b> متغير</b>"
+#: dialogs/classpropdlg.cpp:195
+#, fuzzy
+msgid "Templates Settings"
+msgstr "قوالب إعدادات"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, fuzzy, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals Settings"
+msgstr "الأخطاء المطبعيّة إعدادات"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "صفة إعدادات"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "المحتويات إعدادات"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents Settings"
+msgstr "المحتويات إعدادات"
+
+#: dialogs/classpropdlg.cpp:222
+#, fuzzy
+msgid "Class Associations"
+msgstr "الفئة الجمعيّات"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#, fuzzy
+msgid "new_class"
+msgstr "جديد"
+
+#: dialogs/classwizard.cpp:54
+#, fuzzy
+msgid "New Class"
+msgstr "فئة جديدة"
+
+#: dialogs/classwizard.cpp:59
+#, fuzzy
+msgid "Class Attributes"
+msgstr "الفئة خواص"
+
+#: dialogs/classwizard.cpp:63
+#, fuzzy
+msgid "Class Operations"
+msgstr "الفئة عمليةالمكان:العمليات الحسابيةالعمليات"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
-msgid "QString"
+msgid "Code Generation Options"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\"> سلسلة</p>"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\"> قائمة</p>"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
 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:163
+msgid "Create Folder"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: 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 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating 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:176
+msgid "Please select a valid 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: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 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output 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
-#, fuzzy, no-c-format
-msgid "Public"
-msgstr "عام"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid 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
-#, fuzzy, no-c-format
-msgid "Private"
-msgstr "خاص"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose 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
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, fuzzy, no-c-format
-msgid "Protected"
-msgstr "محمي"
+msgid "Code Viewer"
+msgstr "كود المشاهد"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+#, fuzzy
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\"> لا خيارات متوفّر</p>"
+
+#: dialogs/diagramprintpage.cpp:35
+#, fuzzy
+msgid "&Diagrams"
+msgstr "التخطيطات"
+
+#: dialogs/diagramprintpage.cpp:40
+#, fuzzy
+msgid "Filter"
+msgstr "فلتر"
+
+#: dialogs/diagramprintpage.cpp:48
+#, fuzzy
+msgid "&Current diagram"
+msgstr "االحالي"
+
+#: dialogs/diagramprintpage.cpp:53
+#, fuzzy
+msgid "&All diagrams"
+msgstr "الكل"
+
+#: dialogs/diagramprintpage.cpp:57
+#, fuzzy
+msgid "&Select diagrams"
+msgstr "اختيار"
+
+#: dialogs/diagramprintpage.cpp:61
+#, fuzzy
+msgid "&Type of diagram"
+msgstr "النوع من"
+
+#: dialogs/diagramprintpage.cpp:65
+#, fuzzy
+msgid "Selection"
+msgstr "التحديد"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+#, fuzzy
+msgid "Collaboration"
+msgstr "التّعاون"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+#, fuzzy
+msgid "Sequence"
+msgstr "السلسلة"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "الحالة"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "المكون"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "الإنتشار عرض"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "التخطيط"
+
+#: dialogs/diagramprintpage.cpp:135
+#, fuzzy
+msgid "No diagrams selected."
+msgstr "لا."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Default attribute accessor scope:"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "افتراضي:"
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "ملاحظة الوثائق"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: 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."
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\"> C كود الجيل</p>"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "اللغة"
+#: dialogs/parmpropdlg.cpp:35
+#, fuzzy
+msgid "Parameter Properties"
+msgstr "وسيط خصائص"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, fuzzy, no-c-format
-msgid "Folders"
-msgstr "مجلدات"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+#, fuzzy
+msgid "&Type:"
+msgstr "ال&نوع:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, fuzzy, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "اكتب الكل إلى:"
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+#, fuzzy
+msgid "&Name:"
+msgstr "الإ&سم:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, fuzzy, no-c-format
-msgid "Bro&wse..."
-msgstr "تصفح."
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+#, fuzzy
+msgid "&Initial value:"
+msgstr "الأولي القيمة:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, fuzzy, no-c-format
-msgid "B&rowse..."
-msgstr "تصفح."
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, fuzzy, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "تضمين من:"
+#: dialogs/parmpropdlg.cpp:84
+msgid ""
+"\"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 145
-#: rc.cpp:246
-#, fuzzy, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "ملفات بواسطة كود مولد إلى"
+#: dialogs/pkgcontentspage.cpp:29
+#, fuzzy
+msgid "Contained Items"
+msgstr "محتوى عناصر"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, fuzzy, no-c-format
-msgid ""
-"Files in this folder will be used as heading files in the generated code"
-msgstr "ملفات بوصة بوصة"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+#, fuzzy
+msgid "Select Operation"
+msgstr "اختيار العملية"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, fuzzy, no-c-format
-msgid "Overwrite Policy"
-msgstr "كتابة على السياسة"
+#: dialogs/selectopdlg.cpp:43
+#, fuzzy
+msgid "Sequence number:"
+msgstr "السلسلة الرقم :"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, fuzzy, 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/selectopdlg.cpp:46
+#, fuzzy
+msgid "Class operation:"
+msgstr "الفئة:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, fuzzy, no-c-format
-msgid "O&verwrite"
-msgstr "كتابة على"
+#: dialogs/selectopdlg.cpp:54
+#, fuzzy
+msgid "Custom operation:"
+msgstr "مخصص:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, fuzzy, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "كتابة على بوصة"
+#: dialogs/settingsdlg.cpp:30
+#, fuzzy
+msgid "Umbrello Setup"
+msgstr "Umbrello التعيين"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, fuzzy, no-c-format
-msgid "As&k"
-msgstr "السؤال أولاً"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface"
+msgstr "واجهة المستخدم"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
-#, fuzzy, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "إذا أ مع اسم اسأل إلى"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface Settings"
+msgstr "المستخدم الواجهة إعدادات"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, fuzzy, no-c-format
-msgid "&Use a different name"
-msgstr "استعمل أ اسم"
+#: dialogs/settingsdlg.cpp:54
+#, fuzzy
+msgid "Line color:"
+msgstr "الخط اللون:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, fuzzy, 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/settingsdlg.cpp:60
+#, fuzzy
+msgid "D&efault Color"
+msgstr "افتراضي اللون"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, fuzzy, no-c-format
-msgid "Formatting"
-msgstr "التنسيق"
+#: dialogs/settingsdlg.cpp:63
+#, fuzzy
+msgid "Fill color:"
+msgstr "ملأ اللون:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, fuzzy, no-c-format
-msgid "Lines"
-msgstr "خطوط"
+#: dialogs/settingsdlg.cpp:69
+#, fuzzy
+msgid "De&fault Color"
+msgstr "افتراضي اللون"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
+#: dialogs/settingsdlg.cpp:73
+#, fuzzy
+msgid "Line width:"
 msgstr "الخط:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, fuzzy, no-c-format
-msgid "Indentation type:"
-msgstr "الإزاحة النوع:"
+#: dialogs/settingsdlg.cpp:81
+#, fuzzy
+msgid "D&efault Width"
+msgstr "افتراضي"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, fuzzy, no-c-format
-msgid "Indentation amount:"
-msgstr "الإزاحة:"
+#: dialogs/settingsdlg.cpp:86
+#, fuzzy
+msgid "&Use fill color"
+msgstr "استعمل اللون"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr "ل"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr "نوافذ ل"
+#: dialogs/settingsdlg.cpp:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "تمكين"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, fuzzy, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "الماك"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "استعمل الحالة التخطيط"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, fuzzy, no-c-format
-msgid "No Indentation"
-msgstr "لا الإزاحة"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, fuzzy, no-c-format
-msgid "Tab"
-msgstr "علامة جدولة"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "افتراضي:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, fuzzy, no-c-format
-msgid "Space"
-msgstr "الفضاء"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, fuzzy, no-c-format
-msgid "Comment Verbosity"
-msgstr "تعليق الإسهاب"
+#: dialogs/settingsdlg.cpp:132
+#, fuzzy
+msgid "E&nable autosave"
+msgstr "تمكين"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, fuzzy, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "اكتب لـ فارغ"
+#: dialogs/settingsdlg.cpp:136
+#, fuzzy
+msgid "Select auto-save time interval (mins):"
+msgstr "اختيار آلي حفظ وقت:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, fuzzy, no-c-format
+#: 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"
-msgstr "يكتب إلى بوصة أ فارغ"
+"<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
-#, fuzzy, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "اكتب فارغ"
+#: dialogs/settingsdlg.cpp:158
+#, fuzzy
+msgid "Startup"
+msgstr "بدء التشغيل"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "اكتب لـ و فارغ"
+#: dialogs/settingsdlg.cpp:164
+#, fuzzy
+msgid "Sta&rtup logo"
+msgstr "بدء التشغيل"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Language Options"
-msgstr "اللغة خيارات"
+#: dialogs/settingsdlg.cpp:168
+#, fuzzy
+msgid "&Tip of the day"
+msgstr "تلميحة من يوم"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid "Code Generation Wizard"
-msgstr "كود الجيل المعالج"
+#: dialogs/settingsdlg.cpp:172
+#, fuzzy
+msgid "&Load last project"
+msgstr "تحميل الأخير"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Select Classes"
-msgstr "اختيار الأصناف"
+#: dialogs/settingsdlg.cpp:176
+#, fuzzy
+msgid "Start new project with:"
+msgstr "ابدأ جديد مع:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, fuzzy, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
-msgstr "مكان الكل إلى بوصة يمين قائمة"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "No Diagram"
+msgstr "لا التخطيط"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, fuzzy, no-c-format
-msgid "Add class for code generation"
-msgstr "إضافة لـ"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "Class Diagram"
+msgstr "الفئة التخطيط"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, fuzzy, no-c-format
-msgid "Classes Selected"
-msgstr "الأصناف مختار"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Use Case Diagram"
+msgstr "استعمل الحالة التخطيط"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, fuzzy, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "إزالة من كود الجيل"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Sequence Diagram"
+msgstr "السلسلة التخطيط"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, fuzzy, no-c-format
-msgid "Classes Available"
-msgstr "الأصناف متوفّر"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "Collaboration Diagram"
+msgstr "التّعاون التخطيط"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, fuzzy, no-c-format
-msgid "Code Generation Status"
-msgstr "كود الجيل الحالة"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "State Diagram"
+msgstr "الحالة التخطيط"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "نقر الجيل إلى بدء كود الجيل"
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Activity Diagram"
+msgstr "النّشاط التخطيط"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Generation Status"
-msgstr "الجيل الحالة"
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Component Diagram"
+msgstr "المكون التخطيط"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "كود المشاهد"
+#: dialogs/settingsdlg.cpp:187
+#, fuzzy
+msgid "Deployment Diagram"
+msgstr "الإنتشار التخطيط"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, fuzzy, no-c-format
-msgid "Show hidden blocks"
-msgstr "إظهار مخفي"
+#: dialogs/settingsdlg.cpp:210
+#, fuzzy
+msgid "Class Settings"
+msgstr "الفئة إعدادات"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\"> المكون اسم</p>"
+#: dialogs/settingsdlg.cpp:217
+#, fuzzy
+msgid "Show &visibility"
+msgstr "إظهار"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, fuzzy, no-c-format
-msgid "Show block type"
-msgstr "إظهار النوع"
+#: dialogs/settingsdlg.cpp:221
+#, fuzzy
+msgid "Show attributes"
+msgstr "إظهار"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, fuzzy, no-c-format
-msgid "Colors"
-msgstr "الألوان"
+#: dialogs/settingsdlg.cpp:225
+#, fuzzy
+msgid "Show operations"
+msgstr "إظهار"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, fuzzy, no-c-format
-msgid "Font:"
-msgstr "الخط:"
+#: dialogs/settingsdlg.cpp:229
+#, fuzzy
+msgid "Show stereot&ype"
+msgstr "إظهار"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, fuzzy, no-c-format
-msgid "Paper:"
-msgstr "ورق:"
+#: dialogs/settingsdlg.cpp:233
+#, fuzzy
+msgid "Show attribute signature"
+msgstr "إظهار"
+
+#: dialogs/settingsdlg.cpp:238
+#, fuzzy
+msgid "Show package"
+msgstr "إظهار"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
-msgid "Selected:"
-msgstr "مُنتقى:"
+msgid "Show operation signature"
+msgstr "إظهار"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr "جاري التشغيل Scope"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\"> مخفي</p>"
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "افتراضي:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\"> نص</p>"
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "افتراضي:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\"> قابل للتحرير نص</p>"
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation"
+msgstr "كود الجيل"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, fuzzy, no-c-format
-msgid "Diagram Properties"
-msgstr "التخطيط خصائص"
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation Settings"
+msgstr "كود الجيل إعدادات"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, fuzzy, no-c-format
-msgid "Name:"
-msgstr "الاسم:"
+#: dialogs/settingsdlg.cpp:301
+#, fuzzy
+msgid "Code Viewer Settings"
+msgstr "كود المشاهد إعدادات"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Zoom:"
-msgstr "تحجيم: تكبير: "
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "الحالة الأولى"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "الحالة النهائية"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, fuzzy, no-c-format
-msgid "Show operation signature"
-msgstr "إظهار"
+#: dialogs/statedialog.cpp:96
+#, fuzzy
+msgid "State type:"
+msgstr "الحالة النوع:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, fuzzy, no-c-format
-msgid "Show &grid"
-msgstr "أظهر الش&بكة"
+#: dialogs/statedialog.cpp:101
+#, fuzzy
+msgid "State name:"
+msgstr "الحالة اسم:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, fuzzy, no-c-format
-msgid "Snap &to grid"
-msgstr "الحبس إلى"
+#: dialogs/statedialog.cpp:130
+#, fuzzy
+msgid "Widget Color"
+msgstr "كائن اللون"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "الحبس المكون الحجم"
+#: dialogs/umlattributedialog.cpp:42
+#, fuzzy
+msgid "Attribute Properties"
+msgstr "صفة خصائص"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, fuzzy, no-c-format
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+#, fuzzy
+msgid "Classifier &scope (\"static\")"
+msgstr "المصنّف ثابت"
+
+#: dialogs/umlattributedialog.cpp:91
+#, fuzzy
+msgid "&Public"
+msgstr "عام"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+#, fuzzy
+msgid "Prot&ected"
+msgstr "محمي"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "التطبيق"
+
+#: dialogs/umlattributedialog.cpp:155
+#, fuzzy
+msgid "You have entered an invalid attribute name."
+msgstr "أنت غير صالح اسم."
+
+#: dialogs/umlattributedialog.cpp:156
+#, fuzzy
+msgid "Attribute Name Invalid"
+msgstr "صفة الاسم غير صحيح"
+
+#: dialogs/umlattributedialog.cpp:163
+#, fuzzy
 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 "الحبس الحجم من إلى أ من الحبس إلى شبكة مفعل أ المكون مع تشغيل الكل."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "الـ اسم بوصة."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, fuzzy, no-c-format
-msgid "Grid spacing:  "
-msgstr "شبكة س"
+#: dialogs/umlattributedialog.cpp:164
+#, fuzzy
+msgid "Attribute Name Not Unique"
+msgstr "صفة الاسم لا وحيدفريد"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
+msgstr "صفة خصائص"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, fuzzy, no-c-format
-msgid "Y"
-msgstr "ص"
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "ا&فتراضي"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "تصدير صورة."
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "خواص"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "الحالة النوع:"
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+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:115
+#, fuzzy
+msgid "&Primary"
+msgstr "مكتبة"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "مجلدات"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+msgstr "أنت غير صالح اسم."
+
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "صفة الاسم غير صحيح"
+
+#: dialogs/umlentityattributedialog.cpp:192
+#, fuzzy
 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 "الـ اسم بوصة."
+
+#: dialogs/umlentityattributedialog.cpp:193
+#, fuzzy
+msgid "Entity Attribute Name Not Unique"
+msgstr "صفة الاسم لا وحيدفريد"
+
+#: dialogs/umloperationdialog.cpp:50
+#, fuzzy
+msgid "Operation Properties"
+msgstr "العملية خصائص"
+
+#: dialogs/umloperationdialog.cpp:89
+#, fuzzy
+msgid "&Abstract operation"
+msgstr "ملخص"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umloperationdialog.cpp:120
+#, fuzzy
+msgid "Parameters"
+msgstr "معاملات"
+
+#: dialogs/umloperationdialog.cpp:141
+#, fuzzy
+msgid "Ne&w Parameter..."
+msgstr "جديد وسيط."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+#, fuzzy
+msgid "You have entered an invalid parameter name."
+msgstr "أنت غير صالح اسم."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+#, fuzzy
+msgid "Parameter Name Invalid"
+msgstr "وسيط الاسم غير صحيح"
+
+#: dialogs/umloperationdialog.cpp:339
+#, fuzzy
 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)."
-msgstr ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+msgstr "الـ اسم بوصة."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+#, fuzzy
+msgid "Parameter Name Not Unique"
+msgstr "وسيط الاسم لا وحيدفريد"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:406
+#, fuzzy
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "الـ اسم بوصة."
+
+#: dialogs/umloperationdialog.cpp:456
+#, fuzzy
+msgid "You have entered an invalid operation name."
+msgstr "أنت غير صالح اسم."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+#, fuzzy
+msgid "Operation Name Invalid"
+msgstr "العملية الاسم غير صحيح"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#, fuzzy
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "أداة تعريف مع بوصة ل"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+#, fuzzy
+msgid "Choose a different name or parameter list."
+msgstr "اختيار أ اسم أو قائمة."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, fuzzy, no-c-format
 msgid "Role Properties"
 msgstr "الدور خصائص"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:36
+#, fuzzy
+msgid "Template Properties"
+msgstr "Template خصائص"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, fuzzy, no-c-format
-msgid "Multiplicity:"
-msgstr "التعدّد:"
+#: dialogs/umltemplatedialog.cpp:128
+#, fuzzy
+msgid "You have entered an invalid template name."
+msgstr "أنت غير صالح اسم."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, fuzzy, no-c-format
-msgid "Role Changeability"
-msgstr "الدور التغير"
+#: dialogs/umltemplatedialog.cpp:129
+#, fuzzy
+msgid "Template Name Invalid"
+msgstr "Template الاسم غير صحيح"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, fuzzy, no-c-format
-msgid "Add only"
-msgstr "إضافة"
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "الـ اسم بوصة."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, fuzzy, no-c-format
-msgid "Frozen"
-msgstr "مجمّد"
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "وسيط الاسم لا وحيدفريد"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, fuzzy, no-c-format
-msgid "Changeable"
-msgstr "متغير"
+#: dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Classes Display Options"
+msgstr "الأصناف عرض خيارات"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, fuzzy, no-c-format
-msgid "Role Visibility"
-msgstr "الدور الرؤية"
+#: dialogs/umlviewdialog.cpp:100
+#, fuzzy
+msgid "Diagram Colors"
+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 "التطبيق"
+#: dialogs/umlviewdialog.cpp:164
+#, fuzzy
+msgid "The name you have entered is invalid."
+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"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:170
+#, fuzzy
+msgid "The name you have entered is not unique."
+msgstr "الـ اسم ليس وحيد."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+#, fuzzy
+msgid "Name Not Unique"
+msgstr "الاسم لا وحيدفريد"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+#, fuzzy
+msgid "&Line:"
+msgstr "الخط:"
 
-#: tips.txt:19
+#: dialogs/umlwidgetcolorpage.cpp:68
 #, fuzzy
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr "<p> أكثر عناصر ليس إلى إلى و و تشغيل أحمر</p> ل"
+msgid "&Fill:"
+msgstr "ملأ:"
 
-#: tips.txt:25
+#: dialogs/umlwidgetcolorpage.cpp:75
 #, fuzzy
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr "<p> إذا إلى إضافة إلى أ من شجرة</p> ل"
+msgid "D&efault"
+msgstr "افتراضي"
 
-#: tips.txt:30
+#: dialogs/umlwidgetcolorpage.cpp:78
 #, fuzzy
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr "<p> Umbrello ث جديد بين أ و و قاعدة أ إلى فتح</p> ل"
+msgid "&Use fill"
+msgstr "استعمل"
 
-#: tips.txt:37
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
 #, fuzzy
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr "<p> السلسلة أ و مزدوج لـ خصائص</p> ل"
+msgid "Exporting all views..."
+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"
+#: 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:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-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
+#, fuzzy, c-format
+msgid "There was a problem saving file: %1"
+msgstr "هناك أ 1"
 
-#: 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:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+#, fuzzy
+msgid "Save Error"
+msgstr "خطأ في الحفظ"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello المؤلفون"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "ملف لفتحه"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:60
+#: docgenerators/main.cpp:64
 #, fuzzy
 msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr "<p> قص و نسخ صورة إلى أ KWord غير ذلك</p> ل"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "بول Umbrello المؤلفون"
 
-#: tips.txt:66
+#: docgenerators/main.cpp:67 main.cpp:98
 #, fuzzy
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr "<p> الجمعيّات إلى بوصة سطور double تشغيل أ</p> ل"
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello المؤلفون"
 
-#: tips.txt:71
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
 #, fuzzy
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr "<p> أنت تشغيل بوصة هيئ Umbrello حوار</p> ل"
+msgid "Name"
+msgstr "الاسم"
 
-#: tips.txt:76
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
 #, fuzzy
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p> هو أ بوصة Umbrello رجاء إضافة إلى مع التقرير البقّة من مساعدة قائمة إلى "
-"قائمة</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-"</li>\n"
-"</ul> ل"
+msgid "Enter name:"
+msgstr "أدخل اسم:"
 
-#: tips.txt:86
+#: floatingtextwidget.cpp:112
 #, fuzzy
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr "<p> أنت حذف الكل بواسطة حصة أو إرتداد</p> ل"
+msgid "Enter operation name:"
+msgstr "أدخل اسم:"
 
-#: tips.txt:91
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
 #, fuzzy
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr "<p> إذا أ بوصة Umbrello مع التقرير البقّة بوصة مساعدة قائمة</p> ل"
+msgid "Enter new text:"
+msgstr "أدخل جديد نص:"
 
-#: tips.txt:97
+#: floatingtextwidget.cpp:175
 #, fuzzy
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr "<p> الضغط خروج إلى تحديد إلى</p> ل"
+msgid "ERROR"
+msgstr "خطأ"
 
-#: tips.txt:103
+#: floatingtextwidget.cpp:264
 #, fuzzy
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr "<p> أنت تحديد الكل بواسطة Ctrl A</p> ل"
+msgid "Change Text"
+msgstr "تغيير النصنص"
 
-#: tips.txt:108
+#: folder.cpp:289
 #, fuzzy
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr "<p> أنت و أ جديد جديد الفئة المعالج بوصة كود قائمة</p> ل"
+msgid "The folderfile %1 does not exist."
+msgstr "الـ ليس."
+
+#: 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
+#, fuzzy
+msgid "Load Error"
+msgstr "تحميل خطأ"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "الـ ليس."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 #, fuzzy
@@ -1691,6 +2041,10 @@ msgstr "جديد العملية."
 msgid "Select Operation..."
 msgstr "اختيار العملية."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 #, fuzzy
 msgid "Change Text..."
@@ -1750,6 +2104,19 @@ msgstr "جديد"
 msgid "Rename..."
 msgstr "تغيير الاسم..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "لصق خطأ"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 #, fuzzy
 msgid "Line Color..."
@@ -1783,15 +2150,28 @@ msgstr "لصق خطأ"
 msgid "Import Classes..."
 msgstr "استيراد الأصناف."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "الرزمة"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr ""
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
 msgid "Component Diagram..."
 msgstr "المكون التخطيط."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#, fuzzy
+msgid "Node"
+msgstr "العقدة"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 #, fuzzy
 msgid "Deployment Diagram..."
@@ -1802,11 +2182,19 @@ msgstr "الإنتشار التخطيط."
 msgid "Folder"
 msgstr "المجلد"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr ""
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "التّعاون التخطيط."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "الممثّل"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 #, fuzzy
 msgid "Use Case Diagram..."
@@ -1852,6 +2240,18 @@ msgstr "جديد صفة."
 msgid "Export as Picture..."
 msgstr "تصدير صورة."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "الواجهة"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr ""
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr ""
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
 msgid "Class Diagram..."
@@ -1877,30 +2277,11 @@ msgstr "السلسلة التخطيط."
 msgid "Collaboration Diagram..."
 msgstr "التّعاون التخطيط."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-#, fuzzy
-msgid "Attributes"
-msgstr "خواص"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-#, fuzzy
-msgid "Operations"
-msgstr "عمليةالمكان:العمليات الحسابيةالعمليات"
-
 #: listpopupmenu.cpp:676
 #, fuzzy
 msgid "Public Only"
 msgstr "عام"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-#, fuzzy
-msgid "Visibility"
-msgstr "الرؤية"
-
 #: listpopupmenu.cpp:680
 #, fuzzy
 msgid "Operation Signature"
@@ -1916,12 +2297,6 @@ msgstr "صفة التوقيع"
 msgid "Stereotype"
 msgstr "القالب الجاهز"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-#, fuzzy
-msgid "Show"
-msgstr "إظهار"
-
 #: listpopupmenu.cpp:707
 #, fuzzy
 msgid "Attribute..."
@@ -1951,14 +2326,6 @@ msgstr "ملأ اللون."
 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 "اللون"
-
 #: listpopupmenu.cpp:1007
 #, fuzzy
 msgid "Actor..."
@@ -1992,11 +2359,27 @@ msgstr ""
 msgid "Package..."
 msgstr "حزمة."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr ""
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr ""
+
 #: listpopupmenu.cpp:1032
 #, fuzzy
 msgid "State..."
 msgstr "الحالة."
 
+#: 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..."
@@ -2052,6 +2435,14 @@ msgstr "حذف المرساة"
 msgid "Change Association Name..."
 msgstr "غيّر الجمعيّة الاسم."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 #, fuzzy
 msgid "Clear Diagram"
@@ -2090,8 +2481,8 @@ 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
@@ -2099,198 +2490,106 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "بول Umbrello المؤلفون"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: model_utils.cpp:244
 #, fuzzy
-msgid "Incorrect use of associations."
-msgstr "خاطئ الاستعمل من."
+msgid "new_actor"
+msgstr "جديد"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: model_utils.cpp:246
 #, fuzzy
-msgid "Association Error"
-msgstr "الجمعيّة خطأ"
+msgid "new_usecase"
+msgstr "جديد"
 
-#: folder.cpp:289
+#: model_utils.cpp:248
 #, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "الـ ليس."
+msgid "new_package"
+msgstr "جديد"
 
-#: folder.cpp:293
+#: model_utils.cpp:250
 #, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "الـ ليس."
+msgid "new_component"
+msgstr "جديد المكون"
 
-#: _translatorinfo.cpp:1
+#: model_utils.cpp:252
 #, fuzzy
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "أحمد محمد زواوي"
+msgid "new_node"
+msgstr "جديد"
 
-#: _translatorinfo.cpp:3
+#: model_utils.cpp:254
 #, fuzzy
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "azawawi@emirates.net.ae"
+msgid "new_artifact"
+msgstr "جديد"
 
-#: 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
+#: model_utils.cpp:256
 #, fuzzy
-msgid "Ready."
-msgstr "جاهز."
-
-#: 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 ""
+msgid "new_interface"
+msgstr "جديد"
 
-#: codeimport/import_utils.cpp:183
+#: model_utils.cpp:258
 #, fuzzy
-msgid "Namespace"
+msgid "new_datatype"
 msgstr "جديد"
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
+#: model_utils.cpp:260
 #, fuzzy
-msgid "Internal Error"
-msgstr "لصق خطأ"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
+msgid "new_enum"
+msgstr "جديد"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
+#: model_utils.cpp:262
 #, fuzzy
-msgid "} expected"
-msgstr "مُنتقى:"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+msgid "new_entity"
+msgstr "جديد"
 
-#: codeimport/kdevcppparser/parser.cpp:688
+#: model_utils.cpp:264
 #, fuzzy
-msgid "{ expected"
-msgstr "مُنتقى:"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+msgid "new_folder"
+msgstr "جديد"
 
-#: codeimport/kdevcppparser/parser.cpp:938
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
 #, fuzzy
-msgid "expected a declaration"
-msgstr "اختيار العملية"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+msgid "new_association"
+msgstr "جديد"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: model_utils.cpp:268
+#, fuzzy
+msgid "new_object"
+msgstr "جديد"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-#, fuzzy
-msgid "Base class specifier expected"
-msgstr "الأساس المصنّفون"
-
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: model_utils.cpp:560
+msgid "Illegal method name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-#, fuzzy
-msgid "Class name expected"
-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
@@ -2308,118 +2607,79 @@ msgstr "أدخل اسم:"
 msgid "new_parameter"
 msgstr "جديد"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-#, fuzzy
-msgid "General Options"
-msgstr "الإعدادات العامة"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "حزمة أ"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-#, fuzzy
-msgid "Virtual destructors"
-msgstr "فعلي"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-#, fuzzy
-msgid "Generate empty constructors"
-msgstr "توليد فارغ"
-
-#: codegenerators/cppcodegenerationform.cpp:47
+#: refactoring/refactoringassistant.cpp:289
 #, fuzzy
-msgid "Generate accessor methods"
-msgstr "توليد"
+msgid "Add Base Class"
+msgstr "إضافة الأساس الفئة"
 
-#: codegenerators/cppcodegenerationform.cpp:50
+#: refactoring/refactoringassistant.cpp:290
 #, fuzzy
-msgid "Operations are inline"
-msgstr "عمليةالمكان:العمليات الحسابيةالعمليات"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr ""
+msgid "Add Derived Class"
+msgstr "إضافة مشتقّ الفئة"
 
-#: umlview.cpp:297 umlview.cpp:357
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
 #, fuzzy
-msgid "Diagram: %2 Page %1"
-msgstr "التخطيط صفحة 1"
+msgid "Add Operation"
+msgstr "إضافة العملية"
 
-#: umlview.cpp:2578
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
 #, fuzzy
-msgid "Enter Diagram Name"
-msgstr "أدخل الحالة الاسم"
+msgid "Add Attribute"
+msgstr "إضافة صفة"
 
-#: umlview.cpp:2579
+#: refactoring/refactoringassistant.cpp:297
 #, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "أدخل جديد اسم من:"
+msgid "Add Base Interface"
+msgstr "إضافة الأساس الواجهة"
 
-#: umlview.cpp:2736
+#: refactoring/refactoringassistant.cpp:298
 #, fuzzy
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr "أنت حول إلى حذف?"
+msgid "Add Derived Interface"
+msgstr "إضافة مشتقّ الواجهة"
 
-#: umlview.cpp:2738
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
 #, fuzzy
-msgid "Delete Diagram?"
-msgstr "حذف التخطيط?"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr ""
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr ""
+msgid "Base Classifiers"
+msgstr "الأساس المصنّفون"
 
-#: umllistviewitem.cpp:478
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr "الـ اسم غير صالح."
+msgid "Derived Classifiers"
+msgstr "مشتقّ المصنّفون"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
 #, fuzzy
-msgid "new_association"
-msgstr "جديد"
+msgid "Enter State Name"
+msgstr "أدخل الحالة الاسم"
 
-#: umlcanvasobject.cpp:150
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
 #, fuzzy
-msgid "new_attribute"
-msgstr "جديد"
+msgid "Enter the name of the new state:"
+msgstr "أدخل اسم من جديد:"
 
-#: umlcanvasobject.cpp:153
+#: statewidget.cpp:176
 #, fuzzy
-msgid "new_template"
-msgstr "جديد"
+msgid "Enter Activity"
+msgstr "أدخل النّشاط"
 
-#: umlcanvasobject.cpp:156
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_operation"
-msgstr "جديد"
+msgid "Incorrect use of associations."
+msgstr "خاطئ الاستعمل من."
 
-#: umlcanvasobject.cpp:159
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_literal"
-msgstr "جديد"
+msgid "Association Error"
+msgstr "الجمعيّة خطأ"
 
-#: umlcanvasobject.cpp:162
+#: toolbarstateother.cpp:148 umlview.cpp:2511
 #, fuzzy
-msgid "new_field"
+msgid "new state"
 msgstr "جديد"
 
 #: uml.cpp:179
@@ -2607,12 +2867,6 @@ msgstr "تصدير صورة."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "تصدير صورة."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-#, fuzzy
-msgid "&Properties"
-msgstr "&خصائص"
-
 #: uml.cpp:286
 #, fuzzy
 msgid "&Zoom Slider"
@@ -2706,6 +2960,13 @@ msgstr "الوثائق"
 msgid "Opening file..."
 msgstr "جاري فتح الملف..."
 
+#: 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
 #, fuzzy
 msgid "Creating new document..."
@@ -2713,8 +2974,8 @@ msgstr "جاري إنشاء مستند جديد..."
 
 #: 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"
@@ -2744,6 +3005,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid ""
@@ -2751,6 +3016,10 @@ msgid ""
 "Do you wish to overwrite it?"
 msgstr "الـ إلى?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2794,8 +3063,8 @@ msgstr "جاري ادخال محتويات الحافظة..."
 #: uml.cpp:849
 #, fuzzy
 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 "Umbrello ليس لصق الـ بوصة من النوع إلى."
 
 #: uml.cpp:863
@@ -2855,1449 +3124,1283 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr "اختيار الأصناف إلى استيراد"
 
-#: dialogs/classgenpage.cpp:50
-#, fuzzy
-msgid "Class &name:"
-msgstr "الفئة اسم:"
-
-#: dialogs/classgenpage.cpp:52
+#: umlcanvasobject.cpp:150
 #, fuzzy
-msgid "Actor &name:"
-msgstr "الممثّل اسم:"
+msgid "new_attribute"
+msgstr "جديد"
 
-#: dialogs/classgenpage.cpp:54
+#: umlcanvasobject.cpp:153
 #, fuzzy
-msgid "Package &name:"
-msgstr "حزمة اسم:"
+msgid "new_template"
+msgstr "جديد"
 
-#: dialogs/classgenpage.cpp:56
+#: umlcanvasobject.cpp:156
 #, fuzzy
-msgid "Use case &name:"
-msgstr "استعمل اسم:"
+msgid "new_operation"
+msgstr "جديد"
 
-#: dialogs/classgenpage.cpp:58
+#: umlcanvasobject.cpp:159
 #, fuzzy
-msgid "Interface &name:"
-msgstr "الواجهة اسم:"
+msgid "new_literal"
+msgstr "جديد"
 
-#: dialogs/classgenpage.cpp:60
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Component &name:"
-msgstr "المكون اسم:"
+msgid "new_field"
+msgstr "جديد"
 
-#: dialogs/classgenpage.cpp:62
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "Artifact &name:"
-msgstr "الأداة اسم:"
+msgid "UML Model"
+msgstr "Umbrello"
 
-#: dialogs/classgenpage.cpp:64
+#: umldoc.cpp:106
 #, fuzzy
-msgid "Enum &name:"
-msgstr "اسم:"
+msgid "Logical View"
+msgstr "منطقيّ عرض"
 
-#: dialogs/classgenpage.cpp:66
+#: umldoc.cpp:107
 #, fuzzy
-msgid "Datatype &name:"
-msgstr "اسم:"
+msgid "Use Case View"
+msgstr "استعمل الحالة عرض"
 
-#: dialogs/classgenpage.cpp:68
+#: umldoc.cpp:108
 #, fuzzy
-msgid "Entity &name:"
-msgstr "اسم:"
+msgid "Component View"
+msgstr "المكون عرض"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#: umldoc.cpp:109
 #, fuzzy
-msgid "&Stereotype name:"
-msgstr "القالب الجاهز اسم:"
+msgid "Deployment View"
+msgstr "الإنتشار عرض"
 
-#: dialogs/classgenpage.cpp:107
-#, fuzzy
-msgid "&Package name:"
-msgstr "حزمة اسم:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-#, fuzzy
-msgid "A&bstract class"
-msgstr "ملخص"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:229
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "ملخص"
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"تم تعديل الملف الحالي،\n"
+"هل تريد حفظه؟"
 
-#: dialogs/classgenpage.cpp:131
+#: umldoc.cpp:355
 #, fuzzy
-msgid "&Executable"
-msgstr "قابل للتّنفيذ"
+msgid "The file %1 does not exist."
+msgstr "الـ ليس."
 
-#: dialogs/classgenpage.cpp:138
+#: umldoc.cpp:380
 #, fuzzy
-msgid "Draw As"
-msgstr "رسم ك"
+msgid "The file %1 seems to be corrupted."
+msgstr "الـ ليس."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-#, fuzzy
-msgid "&Default"
-msgstr "ا&فتراضي"
+#: 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:149
-#, fuzzy
-msgid "&Library"
-msgstr "مكتبة"
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "هناك أ 1"
 
-#: dialogs/classgenpage.cpp:152
-#, fuzzy
-msgid "&Table"
-msgstr "&جدول"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy, c-format
+msgid "There was a problem loading file: %1"
+msgstr "هناك أ 1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-#, fuzzy
-msgid "P&ublic"
-msgstr "عام"
+#: umldoc.cpp:641
+#, fuzzy, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "هناك أ 1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
+#: umldoc.cpp:934
 #, fuzzy
-msgid "P&rivate"
-msgstr "خاص"
+msgid "use case diagram"
+msgstr "الاستعمل"
 
-#: dialogs/classgenpage.cpp:182
-#, fuzzy
-msgid "Pro&tected"
-msgstr "محمي"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "التطبيق"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-#, fuzzy
-msgid "Class name:"
-msgstr "اسم الفئة:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-#, fuzzy
-msgid "Instance name:"
-msgstr "برهة اسم:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-#, fuzzy
-msgid "Draw as actor"
-msgstr "رسم"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:277
+#: umldoc.cpp:946
 #, fuzzy
-msgid "Multiple instance"
-msgstr "متعدد"
+msgid "component diagram"
+msgstr "المكون"
 
-#: dialogs/classgenpage.cpp:284
-#, fuzzy
-msgid "Show destruction"
-msgstr "إظهار"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-#, fuzzy
-msgid "Component name:"
-msgstr "المكون اسم:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:324
+#: umldoc.cpp:984 umldoc.cpp:1017
 #, fuzzy
-msgid "Node name:"
-msgstr "العقدة اسم:"
+msgid "That is an invalid name for a diagram."
+msgstr "ذلك غير صالح اسم لـ أ."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
+#: umldoc.cpp:998 umldoc.cpp:1025
 #, fuzzy
-msgid "Stereotype name:"
-msgstr "القالب الجاهز اسم:"
+msgid "A diagram is already using that name."
+msgstr "A اسم."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 #, fuzzy
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr "الـ اسم اسم إعادة الضبط."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-#, fuzzy
-msgid "Name is Not Unique"
-msgstr "الاسم لا وحيدفريد"
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr "الـ اسم ليس وحيد?"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "&Line:"
-msgstr "الخط:"
+msgid "Use Name"
+msgstr "استعمل الحالة"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "&Fill:"
-msgstr "ملأ:"
+msgid "Enter New Name"
+msgstr "أدخل الحالة الاسم"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "D&efault"
-msgstr "افتراضي"
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "هل إلى حذف?"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "&Use fill"
-msgstr "استعمل"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "الأنشطة"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr ""
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "إعادة تسمية"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr ""
+msgid "Delete Diagram"
+msgstr "حذف التخطيط"
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1573
 #, fuzzy
-msgid "Rename Activity"
-msgstr "إعادة تسمية النّشاط"
+msgid "Setting up the document..."
+msgstr "الضبط إلى أعلى."
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
-#, fuzzy
-msgid "Association Properties"
-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
+#: umldoc.cpp:1638
 #, fuzzy
-msgid "General Settings"
-msgstr "الإعدادات العامة"
+msgid "Loading UML elements..."
+msgstr "التحميل."
 
-#: dialogs/assocpropdlg.cpp:94
+#: umldoc.cpp:1811
 #, fuzzy
-msgid "Roles"
-msgstr "الأدوار"
+msgid "Loading diagrams..."
+msgstr "التحميل."
 
-#: dialogs/assocpropdlg.cpp:94
-#, fuzzy
-msgid "Role Settings"
-msgstr "الدور إعدادات"
+#: umldoc.cpp:2104
+#, fuzzy, c-format
+msgid "/autosave%1"
+msgstr "1"
 
-#: 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"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-#, fuzzy
-msgid "Association font"
-msgstr "الجمعيّة الخط"
-
-#: dialogs/umltemplatedialog.cpp:36
-#, fuzzy
-msgid "Template Properties"
-msgstr "Template خصائص"
-
-#: 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 "الخصائص العامة"
-
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-#, fuzzy
-msgid "&Type:"
-msgstr "ال&نوع:"
-
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
+#: umllistview.cpp:416
 #, fuzzy
-msgid "&Name:"
-msgstr "الإ&سم:"
+msgid "Enter Model Name"
+msgstr "أدخل الحالة الاسم"
 
-#: dialogs/umltemplatedialog.cpp:128
+#: umllistview.cpp:417
 #, fuzzy
-msgid "You have entered an invalid template name."
-msgstr "أنت غير صالح اسم."
+msgid "Enter the new name of the model:"
+msgstr "أدخل جديد اسم من:"
 
-#: dialogs/umltemplatedialog.cpp:129
+#: umllistview.cpp:1007
 #, fuzzy
-msgid "Template Name Invalid"
-msgstr "Template الاسم غير صحيح"
+msgid "Views"
+msgstr "المشاهد"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 #, fuzzy
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "الـ اسم بوصة."
-
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "وسيط الاسم لا وحيدفريد"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr "الـ اسم غير صالح."
 
-#: dialogs/umlentityattributedialog.cpp:43
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
 #, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "صفة خصائص"
+msgid "Name Not Valid"
+msgstr "الاسم لا صالح"
 
-#: dialogs/umlentityattributedialog.cpp:73
+#: umllistview.cpp:1923 umllistview.cpp:2160
 #, fuzzy
-msgid "&Default value:"
-msgstr "ا&فتراضي"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr ""
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr "الـ اسم ليس وحيد."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Attributes:"
-msgstr "خواص"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr ""
+msgid "Loading listview..."
+msgstr "التحميل."
 
-#: dialogs/umlentityattributedialog.cpp:112
+#: umllistview.cpp:2670
 #, fuzzy
-msgid "&None"
-msgstr "&جديد"
+msgid "The folder must be emptied before it can be deleted."
+msgstr "الـ محذوف."
 
-#: dialogs/umlentityattributedialog.cpp:115
+#: umllistview.cpp:2671
 #, fuzzy
-msgid "&Primary"
-msgstr "مكتبة"
+msgid "Folder Not Empty"
+msgstr "المجلد لا فارغ"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-#, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "أنت غير صالح اسم."
-
-#: dialogs/umlentityattributedialog.cpp:185
-#, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "صفة الاسم غير صحيح"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistviewitem.cpp:478
 #, fuzzy
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "الـ اسم بوصة."
-
-#: dialogs/umlentityattributedialog.cpp:193
-#, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "صفة الاسم لا وحيدفريد"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-#, fuzzy
-msgid "Display"
-msgstr "عرض"
-
-#: dialogs/umlviewdialog.cpp:93
-#, fuzzy
-msgid "Classes Display Options"
-msgstr "الأصناف عرض خيارات"
-
-#: dialogs/umlviewdialog.cpp:100
-#, fuzzy
-msgid "Diagram Colors"
-msgstr "التخطيط الألوان"
-
-#: dialogs/umlviewdialog.cpp:164
-#, fuzzy
-msgid "The name you have entered is invalid."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr "الـ اسم غير صالح."
 
-#: dialogs/umlviewdialog.cpp:170
-#, fuzzy
-msgid "The name you have entered is not unique."
-msgstr "الـ اسم ليس وحيد."
-
-#: dialogs/assocgenpage.cpp:80
-#, fuzzy
-msgid "Type:"
-msgstr "النوع:"
-
-#: dialogs/settingsdlg.cpp:30
-#, fuzzy
-msgid "Umbrello Setup"
-msgstr "Umbrello التعيين"
-
-#: dialogs/settingsdlg.cpp:47
+#: umlview.cpp:297 umlview.cpp:357
 #, fuzzy
-msgid "User Interface"
-msgstr "واجهة المستخدم"
+msgid "Diagram: %2 Page %1"
+msgstr "التخطيط صفحة 1"
 
-#: dialogs/settingsdlg.cpp:47
+#: umlview.cpp:2578
 #, fuzzy
-msgid "User Interface Settings"
-msgstr "المستخدم الواجهة إعدادات"
+msgid "Enter Diagram Name"
+msgstr "أدخل الحالة الاسم"
 
-#: dialogs/settingsdlg.cpp:54
+#: umlview.cpp:2579
 #, fuzzy
-msgid "Line color:"
-msgstr "الخط اللون:"
+msgid "Enter the new name of the diagram:"
+msgstr "أدخل جديد اسم من:"
 
-#: dialogs/settingsdlg.cpp:60
+#: umlview.cpp:2736
 #, fuzzy
-msgid "D&efault Color"
-msgstr "افتراضي اللون"
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr "أنت حول إلى حذف?"
 
-#: dialogs/settingsdlg.cpp:63
+#: umlview.cpp:2738
 #, fuzzy
-msgid "Fill color:"
-msgstr "ملأ اللون:"
+msgid "Delete Diagram?"
+msgstr "حذف التخطيط?"
 
-#: dialogs/settingsdlg.cpp:69
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "De&fault Color"
-msgstr "افتراضي اللون"
+msgid "Exporting view..."
+msgstr "التحميل."
 
-#: dialogs/settingsdlg.cpp:73
-#, fuzzy
-msgid "Line width:"
-msgstr "الخط:"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:81
+#: umlviewimageexporter.cpp:66
 #, fuzzy
-msgid "D&efault Width"
-msgstr "افتراضي"
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr "الـ إلى?"
 
-#: dialogs/settingsdlg.cpp:86
+#: umlviewimageexporter.cpp:67
 #, fuzzy
-msgid "&Use fill color"
-msgstr "استعمل اللون"
+msgid "File Already Exists"
+msgstr "الملف موجود مسبقا"
 
-#: dialogs/settingsdlg.cpp:108
-#, fuzzy
-msgid "Enable undo"
-msgstr "تمكين"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "لا يستطيع ل"
 
-#: dialogs/settingsdlg.cpp:112
+#: umlviewimageexportermodel.cpp:145
 #, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "استعمل الحالة التخطيط"
+msgid "Can not save an empty diagram"
+msgstr "يمكن أن ليس حفظ فارغ"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-#, fuzzy
-msgid "Use angular association lines"
-msgstr "افتراضي:"
+#: 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:126
-msgid "Autosave"
+#: 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:132
-#, fuzzy
-msgid "E&nable autosave"
-msgstr "تمكين"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "الكائن"
 
-#: dialogs/settingsdlg.cpp:136
-#, fuzzy
-msgid "Select auto-save time interval (mins):"
-msgstr "اختيار آلي حفظ وقت:"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "رسالة متزامنة "
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr ""
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "رسالة غير متزامنة"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:251
+msgid "Label"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-#, fuzzy
-msgid "Startup"
-msgstr "بدء التشغيل"
-
-#: dialogs/settingsdlg.cpp:164
-#, fuzzy
-msgid "Sta&rtup logo"
-msgstr "بدء التشغيل"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "الملاحظة"
 
-#: dialogs/settingsdlg.cpp:168
-#, fuzzy
-msgid "&Tip of the day"
-msgstr "تلميحة من يوم"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "الصندوق"
 
-#: dialogs/settingsdlg.cpp:172
-#, fuzzy
-msgid "&Load last project"
-msgstr "تحميل الأخير"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-#, fuzzy
-msgid "Start new project with:"
-msgstr "ابدأ جديد مع:"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "No Diagram"
-msgstr "لا التخطيط"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "Class Diagram"
-msgstr "الفئة التخطيط"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Use Case Diagram"
-msgstr "استعمل الحالة التخطيط"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Sequence Diagram"
-msgstr "السلسلة التخطيط"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "Collaboration Diagram"
-msgstr "التّعاون التخطيط"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "State Diagram"
-msgstr "الحالة التخطيط"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Activity Diagram"
-msgstr "النّشاط التخطيط"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Component Diagram"
-msgstr "المكون التخطيط"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-#, fuzzy
-msgid "Deployment Diagram"
-msgstr "الإنتشار التخطيط"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "الرسالة"
 
-#: dialogs/settingsdlg.cpp:210
-#, fuzzy
-msgid "Class Settings"
-msgstr "الفئة إعدادات"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-#, fuzzy
-msgid "Show &visibility"
-msgstr "إظهار"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-#, fuzzy
-msgid "Show attributes"
-msgstr "إظهار"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-#, fuzzy
-msgid "Show operations"
-msgstr "إظهار"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-#, fuzzy
-msgid "Show stereot&ype"
-msgstr "إظهار"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-#, fuzzy
-msgid "Show attribute signature"
-msgstr "إظهار"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-#, fuzzy
-msgid "Show package"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
 msgstr "إظهار"
 
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
-msgstr "جاري التشغيل Scope"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "افتراضي:"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "مسح التخطيط"
 
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "افتراضي:"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation"
-msgstr "كود الجيل"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "التعميم"
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation Settings"
-msgstr "كود الجيل إعدادات"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-#, fuzzy
-msgid "Code Viewer Settings"
-msgstr "كود المشاهد إعدادات"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-#, fuzzy
-msgid "Operation Properties"
-msgstr "العملية خصائص"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "الجمعيّة الاسم"
 
-#: dialogs/umloperationdialog.cpp:89
-#, fuzzy
-msgid "&Abstract operation"
-msgstr "ملخص"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-#, fuzzy
-msgid "Classifier &scope (\"static\")"
-msgstr "المصنّف ثابت"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-#, fuzzy
-msgid "Prot&ected"
-msgstr "محمي"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "ا&فتراضي"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "التطبيق"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-#, fuzzy
-msgid "Parameters"
-msgstr "معاملات"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, fuzzy, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "شَّرطة شَّرطة"
 
-#: dialogs/umloperationdialog.cpp:141
-#, fuzzy
-msgid "Ne&w Parameter..."
-msgstr "جديد وسيط."
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, fuzzy, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "شَّرطة نجم"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-#, fuzzy
-msgid "You have entered an invalid parameter name."
-msgstr "أنت غير صالح اسم."
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, fuzzy, no-c-format
+msgid "Style:"
+msgstr "الأسلوب:"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-#, fuzzy
-msgid "Parameter Name Invalid"
-msgstr "وسيط الاسم غير صحيح"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\"> C كود الجيل</p>"
 
-#: dialogs/umloperationdialog.cpp:339
-#, fuzzy
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr "الـ اسم بوصة."
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, fuzzy, no-c-format
+msgid "Method Body Generation"
+msgstr "منهج الجسم الجيل"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-#, fuzzy
-msgid "Parameter Name Not Unique"
-msgstr "وسيط الاسم لا وحيدفريد"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, fuzzy, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "استعمل لـ بوصة:"
 
-#: dialogs/umloperationdialog.cpp:406
-#, fuzzy
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "الـ اسم بوصة."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-#, fuzzy
-msgid "You have entered an invalid operation name."
-msgstr "أنت غير صالح اسم."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-#, fuzzy
-msgid "Operation Name Invalid"
-msgstr "العملية الاسم غير صحيح"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, fuzzy, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b> متغير</b>"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-#, fuzzy
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr "أداة تعريف مع بوصة ل"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, fuzzy, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-#, fuzzy
-msgid "Choose a different name or parameter list."
-msgstr "اختيار أ اسم أو قائمة."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-#, fuzzy
-msgid "Role A Properties"
-msgstr "الدور A خصائص"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-#, fuzzy
-msgid "Role B Properties"
-msgstr "الدور B خصائص"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\"> سلسلة</p>"
 
-#: dialogs/assocrolepage.cpp:68
-#, fuzzy
-msgid "Role A Visibility"
-msgstr "الدور A الرؤية"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\"> قائمة</p>"
 
-#: dialogs/assocrolepage.cpp:69
-#, fuzzy
-msgid "Role B Visibility"
-msgstr "الدور B الرؤية"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-#, fuzzy
-msgid "Role A Changeability"
-msgstr "الدور A التغير"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-#, fuzzy
-msgid "Role B Changeability"
-msgstr "الدور B التغير"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-#, fuzzy
-msgid "Contained Items"
-msgstr "محتوى عناصر"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr ""
 
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "ملاحظة الوثائق"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-#, fuzzy
-msgid "N&ew Attribute..."
-msgstr "جديد صفة."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-#, fuzzy
-msgid "N&ew Operation..."
-msgstr "جديد العملية."
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates"
-msgstr "قوالب"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:45
-#, fuzzy
-msgid "N&ew Template..."
-msgstr "جديد T&emplate."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals"
-msgstr "الأخطاء المطبعيّة"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-#, fuzzy
-msgid "N&ew Enum Literal..."
-msgstr "جديد حرفي."
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "خواص"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "جديد صفة."
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "النشاط الأول"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "افتراضي:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-#, fuzzy
-msgid "Attribute Properties"
-msgstr "صفة خصائص"
-
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-#, fuzzy
-msgid "&Initial value:"
-msgstr "الأولي القيمة:"
-
-#: dialogs/umlattributedialog.cpp:91
-#, fuzzy
-msgid "&Public"
-msgstr "عام"
-
-#: dialogs/umlattributedialog.cpp:155
-#, fuzzy
-msgid "You have entered an invalid attribute name."
-msgstr "أنت غير صالح اسم."
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\"> C كود الجيل</p>"
 
-#: dialogs/umlattributedialog.cpp:156
-#, fuzzy
-msgid "Attribute Name Invalid"
-msgstr "صفة الاسم غير صحيح"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "اللغة"
 
-#: dialogs/umlattributedialog.cpp:163
-#, fuzzy
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "الـ اسم بوصة."
+#: dialogs/codegenerationoptionsbase.ui:93
+#, fuzzy, no-c-format
+msgid "Folders"
+msgstr "مجلدات"
 
-#: dialogs/umlattributedialog.cpp:164
-#, fuzzy
-msgid "Attribute Name Not Unique"
-msgstr "صفة الاسم لا وحيدفريد"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, fuzzy, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "اكتب الكل إلى:"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "اختيار العملية"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Bro&wse..."
+msgstr "تصفح."
 
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "السلسلة الرقم :"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, fuzzy, no-c-format
+msgid "B&rowse..."
+msgstr "تصفح."
 
-#: dialogs/selectopdlg.cpp:46
-#, fuzzy
-msgid "Class operation:"
-msgstr "الفئة:"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "تضمين من:"
 
-#: dialogs/selectopdlg.cpp:54
-#, fuzzy
-msgid "Custom operation:"
-msgstr "مخصص:"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, fuzzy, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "ملفات بواسطة كود مولد إلى"
 
-#: dialogs/diagramprintpage.cpp:35
-#, fuzzy
-msgid "&Diagrams"
-msgstr "التخطيطات"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, fuzzy, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr "ملفات بوصة بوصة"
 
-#: dialogs/diagramprintpage.cpp:40
-#, fuzzy
-msgid "Filter"
-msgstr "فلتر"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, fuzzy, no-c-format
+msgid "Overwrite Policy"
+msgstr "كتابة على السياسة"
 
-#: dialogs/diagramprintpage.cpp:48
-#, fuzzy
-msgid "&Current diagram"
-msgstr "االحالي"
+#: dialogs/codegenerationoptionsbase.ui:214
+#, fuzzy, 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/diagramprintpage.cpp:53
-#, fuzzy
-msgid "&All diagrams"
-msgstr "الكل"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, fuzzy, no-c-format
+msgid "O&verwrite"
+msgstr "كتابة على"
 
-#: dialogs/diagramprintpage.cpp:57
-#, fuzzy
-msgid "&Select diagrams"
-msgstr "اختيار"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, fuzzy, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "كتابة على بوصة"
 
-#: dialogs/diagramprintpage.cpp:61
-#, fuzzy
-msgid "&Type of diagram"
-msgstr "النوع من"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, fuzzy, no-c-format
+msgid "As&k"
+msgstr "السؤال أولاً"
 
-#: dialogs/diagramprintpage.cpp:65
-#, fuzzy
-msgid "Selection"
-msgstr "التحديد"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, fuzzy, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "إذا أ مع اسم اسأل إلى"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-#, fuzzy
-msgid "Collaboration"
-msgstr "التّعاون"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, fuzzy, no-c-format
+msgid "&Use a different name"
+msgstr "استعمل أ اسم"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-#, fuzzy
-msgid "Sequence"
-msgstr "السلسلة"
+#: dialogs/codegenerationoptionsbase.ui:251
+#, fuzzy, 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "الإنتشار عرض"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, fuzzy, no-c-format
+msgid "Formatting"
+msgstr "التنسيق"
 
-#: dialogs/diagramprintpage.cpp:135
-#, fuzzy
-msgid "No diagrams selected."
-msgstr "لا."
+#: dialogs/codegenerationoptionsbase.ui:284
+#, fuzzy, no-c-format
+msgid "Lines"
+msgstr "خطوط"
 
-#: dialogs/classpropdlg.cpp:118
-#, fuzzy
-msgid "Display Options"
-msgstr "اختيارات العرض"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "الخط:"
 
-#: dialogs/classpropdlg.cpp:179
-#, fuzzy
-msgid "Attribute Settings"
-msgstr "صفة إعدادات"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, fuzzy, no-c-format
+msgid "Indentation type:"
+msgstr "الإزاحة النوع:"
 
-#: dialogs/classpropdlg.cpp:187
-#, fuzzy
-msgid "Operation Settings"
-msgstr "العملية إعدادات"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, fuzzy, no-c-format
+msgid "Indentation amount:"
+msgstr "الإزاحة:"
 
-#: dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates Settings"
-msgstr "قوالب إعدادات"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, fuzzy, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "ل"
 
-#: dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals Settings"
-msgstr "الأخطاء المطبعيّة إعدادات"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "نوافذ ل"
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "صفة إعدادات"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, fuzzy, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "الماك"
 
-#: dialogs/classpropdlg.cpp:216
-#, fuzzy
-msgid "Contents Settings"
-msgstr "المحتويات إعدادات"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, fuzzy, no-c-format
+msgid "No Indentation"
+msgstr "لا الإزاحة"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Associations"
-msgstr "الجمعيّات"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, fuzzy, no-c-format
+msgid "Tab"
+msgstr "علامة جدولة"
 
-#: dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Class Associations"
-msgstr "الفئة الجمعيّات"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, fuzzy, no-c-format
+msgid "Space"
+msgstr "الفضاء"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-#, fuzzy
-msgid "Operatio&ns"
-msgstr "عمليةالمكان:العمليات الحسابيةالعمليات"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, fuzzy, no-c-format
+msgid "Comment Verbosity"
+msgstr "تعليق الإسهاب"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-#, fuzzy
-msgid "&Visibility"
-msgstr "الرؤية"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, fuzzy, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "اكتب لـ فارغ"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr "العملية"
+#: dialogs/codegenerationoptionsbase.ui:436
+#, fuzzy, 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/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-#, fuzzy
-msgid "Pac&kage"
-msgstr "حزمة"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, fuzzy, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "اكتب فارغ"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-#, fuzzy
-msgid "Att&ributes"
-msgstr "خواص"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, fuzzy, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "اكتب لـ و فارغ"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-#, fuzzy
-msgid "Stereot&ype"
-msgstr "القالب الجاهز"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, fuzzy, no-c-format
+msgid "Language Options"
+msgstr "اللغة خيارات"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-#, fuzzy
-msgid "Attr&ibute signature"
-msgstr "صفة"
+#: dialogs/codegenerationwizardbase.ui:16
+#, fuzzy, no-c-format
+msgid "Code Generation Wizard"
+msgstr "كود الجيل المعالج"
 
-#: dialogs/classoptionspage.cpp:108
-#, fuzzy
-msgid "Draw as circle"
-msgstr "رسم"
+#: dialogs/codegenerationwizardbase.ui:23
+#, fuzzy, no-c-format
+msgid "Select Classes"
+msgstr "اختيار الأصناف"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "الحالة الأولى"
+#: dialogs/codegenerationwizardbase.ui:40
+#, fuzzy, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr "مكان الكل إلى بوصة يمين قائمة"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "الحالة النهائية"
+#: dialogs/codegenerationwizardbase.ui:78
+#, fuzzy, no-c-format
+msgid "Add class for code generation"
+msgstr "إضافة لـ"
 
-#: dialogs/statedialog.cpp:96
-#, fuzzy
-msgid "State type:"
-msgstr "الحالة النوع:"
+#: dialogs/codegenerationwizardbase.ui:101
+#, fuzzy, no-c-format
+msgid "Classes Selected"
+msgstr "الأصناف مختار"
 
-#: dialogs/statedialog.cpp:101
-#, fuzzy
-msgid "State name:"
-msgstr "الحالة اسم:"
+#: dialogs/codegenerationwizardbase.ui:136
+#, fuzzy, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "إزالة من كود الجيل"
 
-#: dialogs/statedialog.cpp:130
-#, fuzzy
-msgid "Widget Color"
-msgstr "كائن اللون"
+#: dialogs/codegenerationwizardbase.ui:159
+#, fuzzy, no-c-format
+msgid "Classes Available"
+msgstr "الأصناف متوفّر"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-#, fuzzy
-msgid "new_class"
-msgstr "جديد"
+#: dialogs/codegenerationwizardbase.ui:209
+#, fuzzy, no-c-format
+msgid "Code Generation Status"
+msgstr "كود الجيل الحالة"
 
-#: dialogs/classwizard.cpp:54
-#, fuzzy
-msgid "New Class"
-msgstr "فئة جديدة"
+#: dialogs/codegenerationwizardbase.ui:226
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "نقر الجيل إلى بدء كود الجيل"
 
-#: dialogs/classwizard.cpp:59
-#, fuzzy
-msgid "Class Attributes"
-msgstr "الفئة خواص"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, fuzzy, no-c-format
+msgid "Generation Status"
+msgstr "الجيل الحالة"
 
-#: dialogs/classwizard.cpp:63
-#, fuzzy
-msgid "Class Operations"
-msgstr "الفئة عمليةالمكان:العمليات الحسابيةالعمليات"
+#: dialogs/codeviewerdialogbase.ui:43
+#, fuzzy, no-c-format
+msgid "Show hidden blocks"
+msgstr "إظهار مخفي"
 
-#: dialogs/parmpropdlg.cpp:35
-#, fuzzy
-msgid "Parameter Properties"
-msgstr "وسيط خصائص"
+#: dialogs/codeviewerdialogbase.ui:59
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\"> المكون اسم</p>"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
+#: dialogs/codeviewerdialogbase.ui:86
+#, fuzzy, no-c-format
+msgid "Show block type"
+msgstr "إظهار النوع"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:45
+#, fuzzy, no-c-format
+msgid "Colors"
+msgstr "الألوان"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:72
+#, fuzzy, no-c-format
+msgid "Font:"
+msgstr "الخط:"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:103
+#, fuzzy, no-c-format
+msgid "Paper:"
+msgstr "ورق:"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "Selected:"
+msgstr "مُنتقى:"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:276
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\"> مخفي</p>"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:294
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\"> نص</p>"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:333
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\"> قابل للتحرير نص</p>"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:30
+#, fuzzy, no-c-format
+msgid "Diagram Properties"
+msgstr "التخطيط خصائص"
 
-#: 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 ""
+#: dialogs/diagrampropertiespage.ui:92
+#, fuzzy, no-c-format
+msgid "Zoom:"
+msgstr "تحجيم: تكبير: "
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:119
+#, fuzzy, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:186
+#, fuzzy, no-c-format
+msgid "Show &grid"
+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."
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:194
+#, fuzzy, no-c-format
+msgid "Snap &to grid"
+msgstr "الحبس إلى"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:202
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "الحبس المكون الحجم"
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "ليس إلى أ دليل رجاء أ دليل."
+#: dialogs/diagrampropertiespage.ui:205
+#, fuzzy, 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 "الحبس الحجم من إلى أ من الحبس إلى شبكة مفعل أ المكون مع تشغيل الكل."
 
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "رجاء اختيار صالح الدليل"
+#: dialogs/diagrampropertiespage.ui:257
+#, fuzzy, no-c-format
+msgid "Grid spacing:  "
+msgstr "شبكة س"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
 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."
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:284
+#, fuzzy, no-c-format
+msgid "Y"
+msgstr "ص"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "تصدير صورة."
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-#, fuzzy
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\"> لا خيارات متوفّر</p>"
-
-#: associationwidget.cpp:2328
-#, fuzzy
-msgid "Multiplicity"
-msgstr "التعدّد"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-#, fuzzy
-msgid "Enter multiplicity:"
-msgstr "أدخل:"
-
-#: associationwidget.cpp:2346
-#, fuzzy
-msgid "Association Name"
-msgstr "الجمعيّة الاسم"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-#, fuzzy
-msgid "Enter association name:"
-msgstr "أدخل اسم:"
-
-#: associationwidget.cpp:2366
-#, fuzzy
-msgid "Role Name"
-msgstr "الدور الاسم"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "الحالة النوع:"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-#, fuzzy
-msgid "Enter role name:"
-msgstr "أدخل اسم:"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "مجلدات"
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "أدخل اسم:"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Enter new text:"
-msgstr "أدخل جديد نص:"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
+msgstr ""
 
-#: floatingtextwidget.cpp:175
-#, fuzzy
-msgid "ERROR"
-msgstr "خطأ"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, fuzzy, no-c-format
+msgid "Role Changeability"
+msgstr "الدور التغير"
 
-#: floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Change Text"
-msgstr "تغيير النصنص"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, fuzzy, no-c-format
+msgid "Role Visibility"
+msgstr "الدور الرؤية"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr ""
+#: umbrelloui.rc:13
+#, fuzzy, no-c-format
+msgid "&Diagram"
+msgstr "التخطيط"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr ""
+#: umbrelloui.rc:14
+#, fuzzy, no-c-format
+msgid "&New"
+msgstr "&جديد"
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr ""
+#: umbrelloui.rc:31
+#, fuzzy, no-c-format
+msgid "Sh&ow"
+msgstr "إظهار"
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr ""
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "تحجيم: تكبير: "
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr ""
+#: umbrelloui.rc:43
+#, fuzzy, no-c-format
+msgid "&Code"
+msgstr "كود"
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
-msgstr ""
+#: umbrelloui.rc:47
+#, fuzzy, no-c-format
+msgid "Active &Language"
+msgstr "نشط اللغة"
 
-#: aligntoolbar.cpp:383
+#: tips:3
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr ""
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+"<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 ""
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "التحميل."
-
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 #, fuzzy
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr "الـ إلى?"
-
-#: umlviewimageexporter.cpp:67
-#, fuzzy
-msgid "File Already Exists"
-msgstr "الملف موجود مسبقا"
-
-#: model_utils.cpp:244
-#, fuzzy
-msgid "new_actor"
-msgstr "جديد"
-
-#: model_utils.cpp:246
-#, fuzzy
-msgid "new_usecase"
-msgstr "جديد"
-
-#: model_utils.cpp:248
-#, fuzzy
-msgid "new_package"
-msgstr "جديد"
-
-#: model_utils.cpp:250
-#, fuzzy
-msgid "new_component"
-msgstr "جديد المكون"
-
-#: model_utils.cpp:252
-#, fuzzy
-msgid "new_node"
-msgstr "جديد"
-
-#: model_utils.cpp:254
-#, fuzzy
-msgid "new_artifact"
-msgstr "جديد"
-
-#: model_utils.cpp:256
-#, fuzzy
-msgid "new_interface"
-msgstr "جديد"
-
-#: model_utils.cpp:258
-#, fuzzy
-msgid "new_datatype"
-msgstr "جديد"
-
-#: model_utils.cpp:260
-#, fuzzy
-msgid "new_enum"
-msgstr "جديد"
+"<p>Most diagram items can not be resized, they will resize themselves to fit "
+"to their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and "
+"drag on the red square.</p>\n"
+msgstr "<p> أكثر عناصر ليس إلى إلى و و تشغيل أحمر</p> ل"
 
-#: model_utils.cpp:262
+#: tips:30
 #, fuzzy
-msgid "new_entity"
-msgstr "جديد"
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr "<p> إذا إلى إضافة إلى أ من شجرة</p> ل"
 
-#: model_utils.cpp:264
+#: tips:36
 #, fuzzy
-msgid "new_folder"
-msgstr "جديد"
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr "<p> Umbrello ث جديد بين أ و و قاعدة أ إلى فتح</p> ل"
 
-#: model_utils.cpp:268
+#: tips:44
 #, fuzzy
-msgid "new_object"
-msgstr "جديد"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr ""
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr ""
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr ""
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as "
+"actors.  Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr "<p> السلسلة أ و مزدوج لـ خصائص</p> ل"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: 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 ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: 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:289
+#: tips:71
 #, fuzzy
-msgid "Add Base Class"
-msgstr "إضافة الأساس الفئة"
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr "<p> قص و نسخ صورة إلى أ KWord غير ذلك</p> ل"
 
-#: refactoring/refactoringassistant.cpp:290
+#: tips:78
 #, fuzzy
-msgid "Add Derived Class"
-msgstr "إضافة مشتقّ الفئة"
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr "<p> الجمعيّات إلى بوصة سطور double تشغيل أ</p> ل"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
+#: tips:84
 #, fuzzy
-msgid "Add Operation"
-msgstr "إضافة العملية"
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p> أنت تشغيل بوصة هيئ Umbrello حوار</p> ل"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
+#: tips:90
 #, fuzzy
-msgid "Add Attribute"
-msgstr "إضافة صفة"
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
+msgstr ""
+"<p> هو أ بوصة Umbrello رجاء إضافة إلى مع التقرير البقّة من مساعدة قائمة إلى "
+"قائمة</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a></li>\n"
+"</ul> ل"
 
-#: refactoring/refactoringassistant.cpp:297
+#: tips:101
 #, fuzzy
-msgid "Add Base Interface"
-msgstr "إضافة الأساس الواجهة"
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr "<p> أنت حذف الكل بواسطة حصة أو إرتداد</p> ل"
 
-#: refactoring/refactoringassistant.cpp:298
+#: tips:107
 #, fuzzy
-msgid "Add Derived Interface"
-msgstr "إضافة مشتقّ الواجهة"
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr "<p> إذا أ بوصة Umbrello مع التقرير البقّة بوصة مساعدة قائمة</p> ل"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
+#: tips:114
 #, fuzzy
-msgid "Base Classifiers"
-msgstr "الأساس المصنّفون"
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr "<p> الضغط خروج إلى تحديد إلى</p> ل"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
+#: tips:121
 #, fuzzy
-msgid "Derived Classifiers"
-msgstr "مشتقّ المصنّفون"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "لا يستطيع ل"
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p> أنت تحديد الكل بواسطة Ctrl A</p> ل"
 
-#: umlviewimageexportermodel.cpp:145
+#: tips:127
 #, fuzzy
-msgid "Can not save an empty diagram"
-msgstr "يمكن أن ليس حفظ فارغ"
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr ""
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
+msgstr "<p> أنت و أ جديد جديد الفئة المعالج بوصة كود قائمة</p> ل"
 
 #, fuzzy
 #~ msgid "new_stereotype"
diff --git a/tde-i18n-be/messages/tdesdk/umbrello.po b/tde-i18n-be/messages/tdesdk/umbrello.po
index 5c1e48dc9b8..c9f29b169ab 100644
--- a/tde-i18n-be/messages/tdesdk/umbrello.po
+++ b/tde-i18n-be/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-01-29 06:32+0100\n"
 "Last-Translator: Siarhei Liantsevich <serzh.by@gmail.com>\n"
 "Language-Team: Belarusian\n"
@@ -14,294 +14,238 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Аўтары Umbrello"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Адкрыць файл"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Сяржук Лянцэвіч"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:2
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Паўль Хенсген (Paul Hensgen), (c) 2002-2006 Аўтары Umbrello"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "serzh.by@gmail.com"
 
-#: docgenerators/main.cpp:67 main.cpp:98
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
 #, fuzzy
-msgid "Umbrello UML Modeller Authors"
-msgstr "Аўтары Umbrello"
+msgid "Enter Activity Name"
+msgstr "Увядзіце імя дзейнасці"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
 #, fuzzy
-msgid "Exporting all views..."
-msgstr "Захаваць як малюнак..."
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-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
-#, fuzzy, c-format
-msgid "There was a problem saving file: %1"
-msgstr "Памылка пры захаванні файла: %1"
+msgid "Enter the name of the new activity:"
+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
+#: aligntoolbar.cpp:40
 #, fuzzy
-msgid "Save Error"
-msgstr "Памылка захавання"
+msgid "Align Left"
+msgstr "Выраўнаваць па левым боку"
 
-#: worktoolbar.cpp:245
+#: aligntoolbar.cpp:41
 #, fuzzy
-msgid "Object"
-msgstr "Аб'ект"
+msgid "Align Right"
+msgstr "Выраўнаваць па правым боку"
 
-#: worktoolbar.cpp:246
+#: aligntoolbar.cpp:42
 #, fuzzy
-msgid "Synchronous Message"
-msgstr "Сінхроннае паведамленне"
+msgid "Align Top"
+msgstr "Выраўнаваць па верхнім боку"
 
-#: worktoolbar.cpp:247
+#: aligntoolbar.cpp:43
 #, fuzzy
-msgid "Asynchronous Message"
-msgstr "Асінхроннае паведамленне"
+msgid "Align Bottom"
+msgstr "Выраўнаваць па ніжнім боку"
 
-#: association.cpp:87 worktoolbar.cpp:248
+#: aligntoolbar.cpp:44
 #, fuzzy
-msgid "Association"
-msgstr "Асацыяцыя"
+msgid "Align Vertical Middle"
+msgstr "Выраўнаваць вертыкальна (пасярэдзіне)"
 
-#: association.cpp:93 worktoolbar.cpp:249
+#: aligntoolbar.cpp:45
 #, fuzzy
-msgid "Containment"
-msgstr "Ёмістасць"
+msgid "Align Horizontal Middle"
+msgstr "Выраўнаваць гарызантальна (пасярэдзіне)"
 
-#: association.cpp:97 worktoolbar.cpp:250
+#: aligntoolbar.cpp:46
 #, fuzzy
-msgid "Anchor"
-msgstr "Спасылка"
+msgid "Align Vertical Distribute"
+msgstr "Выраўнаваць вертыкальна (пасярэдзіне)"
 
-#: worktoolbar.cpp:251
+#: aligntoolbar.cpp:47
 #, fuzzy
-msgid "Label"
-msgstr "Надпіс"
+msgid "Align Horizontal Distribute"
+msgstr "Выраўнаваць гарызантальна (пасярэдзіне)"
 
-#: worktoolbar.cpp:252
+#: aligntoolbar.cpp:383
 #, fuzzy
-msgid "Note"
-msgstr "Нататка"
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Выраўнаванне можна ўжываць мінімум да двух аб'ектам, напрыклад класам або "
+"акцёрам. Да асацыяцый выраўнаванне ўжываць немагчыма."
 
-#: worktoolbar.cpp:253
+#: aligntoolbar.cpp:384
 #, fuzzy
-msgid "Box"
-msgstr "Блок"
+msgid "Information"
+msgstr "Афармленне"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-#, fuzzy
-msgid "Actor"
-msgstr "Дзеючы твар"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
+#: association.cpp:84
 #, fuzzy
-msgid "Dependency"
-msgstr "Залежнасць"
+msgid "Generalization"
+msgstr "Абагульненне"
 
 #: association.cpp:85 worktoolbar.cpp:256
 #, fuzzy
 msgid "Aggregation"
 msgstr "Агрэгаванне"
 
-#: worktoolbar.cpp:257
-#, fuzzy
-msgid "Relationship"
-msgstr "Дачыненне"
-
-#: worktoolbar.cpp:258
-#, fuzzy
-msgid "Directional Association"
-msgstr "Прамая асацыяцыя"
-
-#: worktoolbar.cpp:259
-#, fuzzy
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Рэалізуе (абагульненне і рэалізацыя)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-#, fuzzy
-msgid "Composition"
-msgstr "Кампазіцыя"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-#, fuzzy
-msgid "Use Case"
-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
-#, fuzzy, no-c-format
-msgid "Class"
-msgstr "Клас"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-#, fuzzy
-msgid "Initial State"
-msgstr "Пачатковы стан"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-#, fuzzy
-msgid "End State"
-msgstr "Канчатковы стан"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+#: association.cpp:86 worktoolbar.cpp:255
 #, fuzzy
-msgid "Branch/Merge"
-msgstr "Падзяліць або аб'яднаць"
+msgid "Dependency"
+msgstr "Залежнасць"
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+#: association.cpp:87 worktoolbar.cpp:248
 #, fuzzy
-msgid "Fork/Join"
-msgstr "Аддзяліць або далучыць"
+msgid "Association"
+msgstr "Асацыяцыя"
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+#: association.cpp:88
 #, fuzzy
-msgid "Package"
-msgstr "Пакет"
+msgid "Self Association"
+msgstr "Самаассаціація"
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#: association.cpp:89
 #, fuzzy
-msgid "Component"
-msgstr "Кампанент"
+msgid "Collaboration Message"
+msgstr "Паведамленне кааперацыі"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#: association.cpp:90
 #, fuzzy
-msgid "Node"
-msgstr "Вузел"
+msgid "Sequence Message"
+msgstr "Сінхроннае паведамленне"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#: association.cpp:91
 #, fuzzy
-msgid "Artifact"
-msgstr "Артэфакт"
+msgid "Collaboration Self Message"
+msgstr "Самапаведамленне кааперацыі"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+#: association.cpp:92
 #, fuzzy
-msgid "Interface"
-msgstr "Інтэрфейс"
+msgid "Sequence Self Message"
+msgstr "Сінхроннае самапаведамленне"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+#: association.cpp:93 worktoolbar.cpp:249
 #, fuzzy
-msgid "Datatype"
-msgstr "Тып дадзеных"
+msgid "Containment"
+msgstr "Ёмістасць"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#: association.cpp:94 worktoolbar.cpp:260
 #, fuzzy
-msgid "Enum"
-msgstr "Які пералічваецца тып"
+msgid "Composition"
+msgstr "Кампазіцыя"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#: association.cpp:95
 #, fuzzy
-msgid "Entity"
-msgstr "Сутнасць"
+msgid "Realization"
+msgstr "Рэалізацыя"
 
-#: worktoolbar.cpp:275
+#: association.cpp:96
 #, fuzzy
-msgid "Deep History"
-msgstr "Глыбей"
+msgid "Uni Association"
+msgstr "Уні-асацыяцыя"
 
-#: worktoolbar.cpp:276
+#: association.cpp:97 worktoolbar.cpp:250
 #, fuzzy
-msgid "Shallow History"
-msgstr "Вышэй"
+msgid "Anchor"
+msgstr "Спасылка"
 
-#: worktoolbar.cpp:277
+#: association.cpp:98 worktoolbar.cpp:284
 #, fuzzy
-msgid "Join"
-msgstr "Далучэнне"
+msgid "State Transition"
+msgstr "Пераход стану"
 
-#: worktoolbar.cpp:278
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
 #, fuzzy
-msgid "Fork"
-msgstr "Аддзяленне"
+msgid "Activity"
+msgstr "Выгляды дзейнасці"
 
-#: worktoolbar.cpp:279
+#: associationwidget.cpp:2328
 #, fuzzy
-msgid "Junction"
-msgstr "Спалучэнне"
+msgid "Multiplicity"
+msgstr "Множнасць"
 
-#: worktoolbar.cpp:280
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
 #, fuzzy
-msgid "Choice"
-msgstr "Выбар"
+msgid "Enter multiplicity:"
+msgstr "Увядзіце множнасць:"
 
-#: association.cpp:98 worktoolbar.cpp:284
+#: associationwidget.cpp:2346
 #, fuzzy
-msgid "State Transition"
-msgstr "Пераход стану"
+msgid "Association Name"
+msgstr "Імя асацыяцыі"
 
-#: worktoolbar.cpp:285
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 #, fuzzy
-msgid "Activity Transition"
-msgstr "Пераход дзейнасці"
+msgid "Enter association name:"
+msgstr "Увядзіце імя асацыяцыі:"
 
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
+#: associationwidget.cpp:2366
 #, fuzzy
-msgid "Activity"
-msgstr "Выгляды дзейнасці"
+msgid "Role Name"
+msgstr "Імя ролі"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
 #, fuzzy
-msgid "State"
-msgstr "Стан"
+msgid "Enter role name:"
+msgstr "Увядзіце імя ролі:"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#: classifier.cpp:201
 #, fuzzy
-msgid "End Activity"
-msgstr "Канчатковая дзейнасць"
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr "Аперацыя з такім жа імем і сігнатурай ужо існуе."
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
 #, fuzzy
-msgid "Initial Activity"
-msgstr "Пачатковая дзейнасць"
+msgid "That is an invalid name."
+msgstr "Няслушнае імя."
 
-#: worktoolbar.cpp:290
+#: 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
 #, fuzzy
-msgid "Message"
-msgstr "Паведамленне"
+msgid "Invalid Name"
+msgstr "Няслушнае імя"
 
-#: worktoolbar.cpp:298
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
 #, fuzzy
-msgid "UNDEFINED"
-msgstr "UNDEFINED"
+msgid "That name is already being used."
+msgstr "Імя ўжо выкарыстоўваецца."
 
-#: worktoolbar.cpp:302
+#: 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
 #, fuzzy
-msgid "Select"
-msgstr "Вылучэнне"
+msgid "Not a Unique Name"
+msgstr "Імя ўжо выкарыстоўваецца"
 
 #: clipboard/umlclipboard.cpp:687
 #, fuzzy
 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."
+"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 ""
 "Да мінімуму адзін з элементаў, якія змяшчаюцца ў буферы абмену, не можа быць "
 "устаўлены з-за канфлікту імёнаў. Астатнія элементы ўстаўленыя."
@@ -317,8 +261,8 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Немагчыма адкрыць файл %1 для запісу. Упэўніцеся, што тэчка існуе і ў вас ёсць "
-"правы запісы ў яе."
+"Немагчыма адкрыць файл %1 для запісу. Упэўніцеся, што тэчка існуе і ў вас "
+"ёсць правы запісы ў яе."
 
 #: codegenerator.cpp:473
 #, fuzzy
@@ -327,10 +271,8 @@ msgstr "Немагчыма адкрыць файл"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
 #, fuzzy
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Немагчыма стварыць тэчку:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Немагчыма стварыць тэчку:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 #, fuzzy
@@ -346,1419 +288,1810 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Немагчыма стварыць тэчку"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#: codegenerators/cppcodegenerationform.cpp:36
 #, fuzzy
-msgid "Enter State Name"
-msgstr "Увядзіце імя стану"
+msgid "General Options"
+msgstr "Агульныя параметры"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+#: codegenerators/cppcodegenerationform.cpp:38
 #, fuzzy
-msgid "Enter the name of the new state:"
-msgstr "Увядзіце імя новага стану:"
+msgid "Package is a namespace"
+msgstr "Пакет з'яўляецца прасторай імёнаў"
 
-#: statewidget.cpp:176
+#: codegenerators/cppcodegenerationform.cpp:41
 #, fuzzy
-msgid "Enter Activity"
-msgstr "Увядзіце дзейнасць"
+msgid "Virtual destructors"
+msgstr "Віртуальныя дэструктары"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
+#: codegenerators/cppcodegenerationform.cpp:44
 #, fuzzy
-msgid "Enter the name of the new activity:"
-msgstr "Увядзіце імя новай дзейнасці:"
+msgid "Generate empty constructors"
+msgstr "Генераваць пустыя канструктары"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
+#: codegenerators/cppcodegenerationform.cpp:47
 #, fuzzy
-msgid "new activity"
-msgstr "новая дзейнасць"
+msgid "Generate accessor methods"
+msgstr "Генераваць метады доступу да атрыбутаў"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: codegenerators/cppcodegenerationform.cpp:50
 #, fuzzy
-msgid "UML Model"
-msgstr "Мадэль UML"
+msgid "Operations are inline"
+msgstr "Убудавальныя аперацыі"
 
-#: umldoc.cpp:106
+#: codegenerators/cppcodegenerationform.cpp:53
 #, fuzzy
-msgid "Logical View"
-msgstr "Лагічнае паданне"
+msgid "Accessors are inline"
+msgstr "Убудавальныя метады доступу да атрыбутаў"
 
-#: umldoc.cpp:107
+#: codegenerators/cppcodegenerationform.cpp:57
 #, fuzzy
-msgid "Use Case View"
-msgstr "Прэцэдэнты"
+msgid "Accessors are public"
+msgstr "Адчыненыя метады доступу да атрыбутаў"
 
-#: umldoc.cpp:108
+#: codeimport/classimport.cpp:34
 #, fuzzy
-msgid "Component View"
-msgstr "Кампаненты"
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Імпартаванне файла: %1 Выканана: %2/%3"
 
-#: umldoc.cpp:109
+#: 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
 #, fuzzy
-msgid "Deployment View"
-msgstr "Разгортванне"
+msgid "Ready."
+msgstr "Гатова."
 
-#: umldoc.cpp:110
+#: codeimport/import_utils.cpp:181
 #, fuzzy
-msgid "Entity Relationship Model"
-msgstr "Адносіны"
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Вобласць бачнасці %1 абмяжоўваецца прасторай імёнаў або класам?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
+#: codeimport/import_utils.cpp:182
 #, fuzzy
-msgid "Datatypes"
-msgstr "Тыпы дадзеных"
+msgid "C++ Import Requests Your Help"
+msgstr "Імпарт у C++ патрабуе вашага ўмяшання"
 
-#: umldoc.cpp:229
+#: codeimport/import_utils.cpp:183
 #, fuzzy
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Бягучы файл быў зменены.\n"
-"Захаваць яго?"
+msgid "Namespace"
+msgstr "Прастора імёнаў"
 
-#: umldoc.cpp:355
-#, fuzzy
-msgid "The file %1 does not exist."
-msgstr "Файл %1 не існуе."
+#: 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
+#, fuzzy, no-c-format
+msgid "Class"
+msgstr "Клас"
 
-#: 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
+#: codeimport/kdevcppparser/errors.cpp:23
 #, fuzzy
-msgid "Load Error"
-msgstr "Памылка загрузкі"
+msgid "Internal Error"
+msgstr "Унутраная памылка"
 
-#: umldoc.cpp:380
+#: codeimport/kdevcppparser/errors.cpp:24
 #, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "Файл %1 пашкоджаны."
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, fuzzy, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Сціснуты файл %1 не ўтрымоўвае XMI."
+msgid "Syntax Error before '%1'"
+msgstr "Сінтаксічная памылка перад '%1'"
 
-#: umldoc.cpp:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Памылка пры загрузцы распакаванага файла: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+#, fuzzy
+msgid "Parse Error before '%1'"
+msgstr "Памылка граматычнага разбору перад '%1'"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, fuzzy, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Памылка пры загрузцы файла: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+#, fuzzy
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, fuzzy, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Памылка пры запампоўцы файла на сервер: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+#, fuzzy
+msgid "expression expected"
+msgstr "чакаецца выраз"
 
-#: umldoc.cpp:934
+#: codeimport/kdevcppparser/parser.cpp:598
 #, fuzzy
-msgid "use case diagram"
-msgstr "Дыяграма прэцэдэнтаў"
+msgid "Declaration syntax error"
+msgstr "Памылка ў сінтаксісе аб'явы"
 
-#: umldoc.cpp:936
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
 #, fuzzy
-msgid "class diagram"
-msgstr "Дыяграма класаў"
+msgid "} expected"
+msgstr "} чакалася"
 
-#: umldoc.cpp:938
+#: codeimport/kdevcppparser/parser.cpp:684
 #, fuzzy
-msgid "sequence diagram"
-msgstr "Дыяграма паслядоўнасці"
+msgid "namespace expected"
+msgstr "прастора імёнаў чакалася"
 
-#: umldoc.cpp:940
+#: codeimport/kdevcppparser/parser.cpp:688
 #, fuzzy
-msgid "collaboration diagram"
-msgstr "Дыяграма кааперацыі"
+msgid "{ expected"
+msgstr "{ чакалася"
 
-#: umldoc.cpp:942
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
 #, fuzzy
-msgid "state diagram"
-msgstr "Дыяграма станаў"
+msgid "Namespace name expected"
+msgstr "Чакаецца імя прасторы імёнаў"
 
-#: umldoc.cpp:944
+#: codeimport/kdevcppparser/parser.cpp:869
 #, fuzzy
-msgid "activity diagram"
-msgstr "Дыяграма дзейнасці"
+msgid "Need a type specifier to declare"
+msgstr "Неабходны спеціфікатар тыпу для аб'явы"
 
-#: umldoc.cpp:946
+#: codeimport/kdevcppparser/parser.cpp:938
 #, fuzzy
-msgid "component diagram"
-msgstr "Дыяграма кампанентаў"
+msgid "expected a declaration"
+msgstr "чакаецца аб'ява"
 
-#: umldoc.cpp:948
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
 #, fuzzy
-msgid "deployment diagram"
-msgstr "Дыяграма разгортвання"
+msgid "Constant expression expected"
+msgstr "Чакалася константное выраз"
 
-#: umldoc.cpp:950
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
 #, fuzzy
-msgid "entity relationship diagram"
-msgstr "Дыяграма адносін сутнасцяў"
+msgid "')' expected"
+msgstr "')' чакалася"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
 #, fuzzy
-msgid "Name"
-msgstr "Імя"
+msgid "} missing"
+msgstr "} прапушчана"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#: codeimport/kdevcppparser/parser.cpp:2074
 #, fuzzy
-msgid "Enter name:"
-msgstr "Увядзіце імя:"
+msgid "Member initializers expected"
+msgstr "Чакаліся ініціалізатары чальцоў"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
+#: codeimport/kdevcppparser/parser.cpp:2235
 #, fuzzy
-msgid "That is an invalid name for a diagram."
-msgstr "Недапушчальнае імя дыяграмы."
+msgid "Base class specifier expected"
+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
+#: codeimport/kdevcppparser/parser.cpp:2260
 #, fuzzy
-msgid "Invalid Name"
-msgstr "Няслушнае імя"
+msgid "Initializer clause expected"
+msgstr "Чакаецца канструкцыя ініцыялізацыі"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
+#: codeimport/kdevcppparser/parser.cpp:2303
 #, fuzzy
-msgid "A diagram is already using that name."
-msgstr "Дыяграма ўжо выкарыстае гэтае імя."
+msgid "Identifier expected"
+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
+#: codeimport/kdevcppparser/parser.cpp:2337
 #, fuzzy
-msgid "Not a Unique Name"
-msgstr "Імя ўжо выкарыстоўваецца"
+msgid "Type id expected"
+msgstr "Чакаецца ідэнтыфікатар тыпу"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+#: codeimport/kdevcppparser/parser.cpp:2374
 #, fuzzy
-msgid "That is an invalid name."
-msgstr "Няслушнае імя."
+msgid "Class name expected"
+msgstr "Чакалася імя класа"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
 #, fuzzy
-msgid "That name is already being used."
-msgstr "Імя ўжо выкарыстоўваецца."
+msgid "condition expected"
+msgstr "чакаецца ўмоўны выраз"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
 #, fuzzy
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Такое імя ўжо існуе.\n"
-"Вы жадаеце менавіта гэта?"
+msgid "statement expected"
+msgstr "чакаецца выраз"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
+#: codeimport/kdevcppparser/parser.cpp:2705
 #, fuzzy
-msgid "Name Not Unique"
-msgstr "Імя існуе"
+msgid "for initialization expected"
+msgstr "чакаецца ініцыялізацыя for"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: codeimport/kdevcppparser/parser.cpp:3273
 #, fuzzy
-msgid "Use Name"
-msgstr "Выкарыстаць паказанае імя"
+msgid "catch expected"
+msgstr "чакаецца catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: 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 "Enter New Name"
-msgstr "Увядзіце новае імя"
+msgid "Properties"
+msgstr "Уласцівасці"
 
-#: umldoc.cpp:1099
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Выдаліць '%1'?"
+msgid "Initial activity"
+msgstr "Пачатковая дзейнасць"
 
-#: umldoc.cpp:1099
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "Delete Diagram"
-msgstr "Выдаліць дыяграму"
+msgid "End activity"
+msgstr "Канчатковая дзейнасць"
 
-#: umldoc.cpp:1573
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
 #, fuzzy
-msgid "Setting up the document..."
-msgstr "Пабудова дакумента..."
+msgid "Branch/Merge"
+msgstr "Падзяліць або аб'яднаць"
 
-#: umldoc.cpp:1600
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
 #, fuzzy
-msgid "Resolving object references..."
-msgstr "Дазвол спасылак на аб'екты..."
+msgid "Fork/Join"
+msgstr "Аддзяліць або далучыць"
 
-#: umldoc.cpp:1638
+#: 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
+#, fuzzy, no-c-format
+msgid "General"
+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
 #, fuzzy
-msgid "Loading UML elements..."
-msgstr "Загрузка элементаў UML..."
+msgid "General Properties"
+msgstr "Агульныя параметры"
 
-#: umldoc.cpp:1811
+#: dialogs/activitydialog.cpp:82
 #, fuzzy
-msgid "Loading diagrams..."
-msgstr "Загрузка дыяграм..."
+msgid "Activity type:"
+msgstr "Тып дзейнасці:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#: dialogs/activitydialog.cpp:87
 #, fuzzy
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+msgid "Activity name:"
+msgstr "Імя дзейнасці:"
 
-#: umldoc.cpp:2104
-#, fuzzy, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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
+#, fuzzy, no-c-format
+msgid "Documentation"
+msgstr "Дакументацыя"
 
-#: umllistview.cpp:348
+#: 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 "Externalize Folder"
-msgstr "Зрабіць тэчку знешняй"
+msgid "Font"
+msgstr "Шрыфт:"
 
-#: umllistview.cpp:416
+#: 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 "Enter Model Name"
-msgstr "Увядзіце імя мадэлі"
+msgid "Font Settings"
+msgstr "Налады шрыфтоў"
 
-#: umllistview.cpp:417
+#: 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
 #, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "Увядзіце новае імя мадэлі:"
+msgid "Color"
+msgstr "Колер"
 
-#: umllistview.cpp:1007
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
 #, fuzzy
-msgid "Views"
-msgstr "Паданні"
+msgid "Widget Colors"
+msgstr "Колеры"
 
-#: umllistview.cpp:1906
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Паказанае імя недапушчальна\n"
-"Стварэнне скасавана."
+msgid "Activities"
+msgstr "Дзейнасці"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
+#: dialogs/activitypage.cpp:72
 #, fuzzy
-msgid "Name Not Valid"
-msgstr "Няправільнае імя"
+msgid "New Activity..."
+msgstr "Новая дзейнасць..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Паказанае імя ўжо выкарыстоўваецца\n"
-"Стварэнне скасавана."
+msgid "Delete"
+msgstr "Выдаліць спасылку"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
 #, fuzzy
-msgid "Creation canceled"
-msgstr "Стварэнне скасавана"
+msgid "Rename"
+msgstr "Пераназваць"
 
-#: umllistview.cpp:2338
+#: dialogs/activitypage.cpp:134
 #, fuzzy
-msgid "Loading listview..."
-msgstr "Загрузка спісу..."
+msgid "New Activity"
+msgstr "Новая дзейнасць"
 
-#: umllistview.cpp:2670
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
 #, fuzzy
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Выдаляемая тэчка павінна быць пусты."
+msgid "new activity"
+msgstr "новая дзейнасць"
 
-#: umllistview.cpp:2671
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "Folder Not Empty"
-msgstr "Тэчка не пустая"
+msgid "Rename Activity"
+msgstr "Пераназваць дзейнасць"
 
-#: classifier.cpp:201
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "Аперацыя з такім жа імем і сігнатурай ужо існуе."
+msgid "Enter the new name of the activity:"
+msgstr "Увядзіце новае імя дзейнасці:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, fuzzy, no-c-format
+msgid "Name:"
+msgstr "Імя:"
+
+#: dialogs/assocgenpage.cpp:80
 #, fuzzy
-msgid "Enter Activity Name"
-msgstr "Увядзіце імя дзейнасці"
+msgid "Type:"
+msgstr "Тып:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
 #, fuzzy
-msgid "new state"
-msgstr "новы стан"
+msgid "Associations"
+msgstr "Асацыяцыі"
 
-#: association.cpp:84
+#: dialogs/assocpropdlg.cpp:39
 #, fuzzy
-msgid "Generalization"
-msgstr "Абагульненне"
+msgid "Association Properties"
+msgstr "Уласцівасці асацыяцыі"
 
-#: association.cpp:88
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
 #, fuzzy
-msgid "Self Association"
-msgstr "Самаассаціація"
+msgid "General Settings"
+msgstr "Агульныя налады"
 
-#: association.cpp:89
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "Collaboration Message"
-msgstr "Паведамленне кааперацыі"
+msgid "Roles"
+msgstr "Ролі"
 
-#: association.cpp:90
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "Sequence Message"
-msgstr "Сінхроннае паведамленне"
+msgid "Role Settings"
+msgstr "Канфігурацыя роляў"
 
-#: association.cpp:91
+#: dialogs/assocpropdlg.cpp:112
 #, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Самапаведамленне кааперацыі"
+msgid "Association font"
+msgstr "Шрыфт асацыяцыі"
 
-#: association.cpp:92
+#: dialogs/assocrolepage.cpp:50
 #, fuzzy
-msgid "Sequence Self Message"
-msgstr "Сінхроннае самапаведамленне"
+msgid "Role A Properties"
+msgstr "Уласцівасці ролі A"
 
-#: association.cpp:95
+#: dialogs/assocrolepage.cpp:51
 #, fuzzy
-msgid "Realization"
-msgstr "Рэалізацыя"
+msgid "Role B Properties"
+msgstr "Уласцівасці ролі B"
 
-#: association.cpp:96
+#: dialogs/assocrolepage.cpp:68
 #, fuzzy
-msgid "Uni Association"
-msgstr "Уні-асацыяцыя"
+msgid "Role A Visibility"
+msgstr "Бачнасць ролі A"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:69
+#, fuzzy
+msgid "Role B Visibility"
+msgstr "Бачнасць ролі B"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "&Diagram"
-msgstr "Дыяграма"
+#: dialogs/assocrolepage.cpp:70
+#, fuzzy
+msgid "Role A Changeability"
+msgstr "Магчымасць змены ролі A"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, fuzzy, no-c-format
-msgid "&New"
-msgstr "Стварыць"
+#: dialogs/assocrolepage.cpp:71
+#, fuzzy
+msgid "Role B Changeability"
+msgstr "Магчымасць змены ролі B"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, fuzzy, no-c-format
-msgid "Sh&ow"
-msgstr "Паказаць"
+msgid "Rolename:"
+msgstr "Імя ролі:"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, fuzzy, no-c-format
-msgid "&Code"
-msgstr "Код"
+msgid "Multiplicity:"
+msgstr "Множнасць:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: 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
 #, fuzzy, no-c-format
-msgid "Active &Language"
-msgstr "Бягучая мова"
+msgid "Public"
+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
+#: 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
 #, fuzzy, no-c-format
-msgid "Documentation"
-msgstr "Дакументацыя"
+msgid "Private"
+msgstr "Прыватны"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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
 #, fuzzy, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Слеш-Слеш (//)"
+msgid "Protected"
+msgstr "Абаронены"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, fuzzy, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Слеш-Зорачка (/**  */)"
+msgid "Implementation"
+msgstr "Рэалізацыя"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, fuzzy, no-c-format
-msgid "Style:"
-msgstr "Стыль:"
+msgid "Changeable"
+msgstr "Магчымасць змены"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, fuzzy, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Генераванне кода C++</p>"
+msgid "Frozen"
+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
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, fuzzy, no-c-format
-msgid "General"
-msgstr "Агульныя"
+msgid "Add only"
+msgstr "Толькі даданне"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Method Body Generation"
-msgstr "Генераванне цела метаду"
+#: dialogs/classgenpage.cpp:50
+#, fuzzy
+msgid "Class &name:"
+msgstr "Імя класа:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Выкарыстаць наступныя класы пры генераванні кода:"
+#: dialogs/classgenpage.cpp:52
+#, fuzzy
+msgid "Actor &name:"
+msgstr "Імя дзеючага твару:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:54
+#, fuzzy
+msgid "Package &name:"
+msgstr "Імя пакета:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:56
+#, fuzzy
+msgid "Use case &name:"
+msgstr "Імя прэцэдэнту:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Пераменная</b>"
+#: dialogs/classgenpage.cpp:58
+#, fuzzy
+msgid "Interface &name:"
+msgstr "Імя інтэрфейсу:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, fuzzy, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:60
+#, fuzzy
+msgid "Component &name:"
+msgstr "Імя кампанента:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:62
+#, fuzzy
+msgid "Artifact &name:"
+msgstr "Імя артэфакту:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, fuzzy, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:64
+#, fuzzy
+msgid "Enum &name:"
+msgstr "Імя які пералічваецца тыпу:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:66
+#, fuzzy
+msgid "Datatype &name:"
+msgstr "Імя тыпу дадзеных:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:68
+#, fuzzy
+msgid "Entity &name:"
+msgstr "Імя сутнасці:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, fuzzy, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#, fuzzy
+msgid "&Stereotype name:"
+msgstr "Імя стэрэатыпу:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, fuzzy, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:107
+#, fuzzy
+msgid "&Package name:"
+msgstr "Імя пакета:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, fuzzy, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:121
+#, fuzzy
+msgid "A&bstract class"
+msgstr "Абстрактны клас"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Class name"
-msgstr "Імя класа"
+#: dialogs/classgenpage.cpp:123
+#, fuzzy
+msgid "A&bstract use case"
+msgstr "Абстрактны прэцэдэнт"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, fuzzy, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Уключыць файл</p></i>"
+#: dialogs/classgenpage.cpp:131
+#, fuzzy
+msgid "&Executable"
+msgstr "Камандны файл"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Project Generation"
-msgstr "Генераванне праекту"
+#: dialogs/classgenpage.cpp:138
+#, fuzzy
+msgid "Draw As"
+msgstr "Паказваць як"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Стварыць зборачны файл ANT"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+#, fuzzy
+msgid "&Default"
+msgstr "Па змаўчанні"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
 #, fuzzy, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Генераваць метады аўтаматычна"
+msgid "&File"
+msgstr "Фон:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, fuzzy, no-c-format
-msgid "Empty constructor methods"
-msgstr "Пустыя канструктары"
+#: dialogs/classgenpage.cpp:149
+#, fuzzy
+msgid "&Library"
+msgstr "Бібліятэка"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, fuzzy, no-c-format
-msgid "Association accessor methods"
-msgstr "Метады доступу да асацыяцыі"
+#: dialogs/classgenpage.cpp:152
+#, fuzzy
+msgid "&Table"
+msgstr "Табліца"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, fuzzy, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Метады доступу да атрыбутаў"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+#, fuzzy
+msgid "Visibility"
+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
-#, fuzzy, no-c-format
-msgid "Public"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+#, fuzzy
+msgid "P&ublic"
 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
-#, fuzzy, no-c-format
-msgid "Private"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+#, fuzzy
+msgid "P&rivate"
 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
-#, fuzzy, no-c-format
-msgid "Protected"
+#: dialogs/classgenpage.cpp:182
+#, fuzzy
+msgid "Pro&tected"
 msgstr "Абаронены"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, fuzzy, no-c-format
-msgid "From Parent Object"
-msgstr "Ад бацькоўскага аб'екта"
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "Рэалізацыя"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Вобласць бачнасці метадаў доступу да атрыбутаў па змаўчанні:"
+#: dialogs/classgenpage.cpp:256
+#, fuzzy
+msgid "Class name:"
+msgstr "Імя класа:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "Вобласць бачнасці палёў асацыяцыі па змаўчанні:"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#, fuzzy
+msgid "Instance name:"
+msgstr "Імя асобніка:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, fuzzy, no-c-format
-msgid "From Parent Role"
-msgstr "Ад бацькоўскай ролі"
+#: dialogs/classgenpage.cpp:272
+#, fuzzy
+msgid "Draw as actor"
+msgstr "Маляваць як дзеючы твар"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Генерацыя кода на Java</p>"
+#: dialogs/classgenpage.cpp:277
+#, fuzzy
+msgid "Multiple instance"
+msgstr "Некалькі асобнікаў"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, fuzzy, no-c-format
-msgid "Hash (#)"
-msgstr "Дыез (#)"
+#: dialogs/classgenpage.cpp:284
+#, fuzzy
+msgid "Show destruction"
+msgstr "Паказаць дэструкцыю"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, fuzzy, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Пачатак-канец (=begin  =end)"
+#: dialogs/classgenpage.cpp:322
+#, fuzzy
+msgid "Component name:"
+msgstr "Імя кампанента:"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Генераванне кода Ruby</p>"
+#: dialogs/classgenpage.cpp:324
+#, fuzzy
+msgid "Node name:"
+msgstr "Імя вузла:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+#, fuzzy
+msgid "Stereotype name:"
+msgstr "Імя стэрэатыпу:"
+
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
+#, fuzzy
+msgid ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
+msgstr ""
+"Гэтае імя ўжо выкарыстоўваецца.\n"
+"Яно скінута."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+#, fuzzy
+msgid "Name is Not Unique"
+msgstr "Імя ўжо існуе"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+#, fuzzy
+msgid "Attributes"
+msgstr "Атрыбуты"
+
+#: dialogs/classifierlistpage.cpp:39
+#, fuzzy
+msgid "N&ew Attribute..."
+msgstr "Стварыць атрыбут..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+#, fuzzy
+msgid "Operations"
+msgstr "Аперацыі"
+
+#: dialogs/classifierlistpage.cpp:42
+#, fuzzy
+msgid "N&ew Operation..."
+msgstr "Стварыць аперацыю..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+#, fuzzy
+msgid "Templates"
+msgstr "Шаблоны"
+
+#: dialogs/classifierlistpage.cpp:45
+#, fuzzy
+msgid "N&ew Template..."
+msgstr "Стварыць шаблон..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals"
+msgstr "Якія пералічваюцца канстанты"
+
+#: dialogs/classifierlistpage.cpp:48
+#, fuzzy
+msgid "N&ew Enum Literal..."
+msgstr "Дадаць якая пералічваецца канстанту..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "Атрыбуты сутнасці"
+
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "Стварыць атрыбут сутнасці..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Выдаліць спасылку"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+#, fuzzy
+msgid "&Properties"
+msgstr "Уласцівасці"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+#, fuzzy
+msgid "Show"
+msgstr "Паказаць"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+#, fuzzy
+msgid "Operatio&ns"
+msgstr "Аперацыі"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+#, fuzzy
+msgid "&Visibility"
+msgstr "Бачнасць"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+#, fuzzy
+msgid "O&peration signature"
+msgstr "Сігнатура аперацыі"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+#, fuzzy
+msgid "Pac&kage"
+msgstr "Пакет"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+#, fuzzy
+msgid "Att&ributes"
+msgstr "Атрыбуты"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+#, fuzzy
+msgid "Stereot&ype"
+msgstr "Стэрэатып"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+#, fuzzy
+msgid "Attr&ibute signature"
+msgstr "Сігнатура атрыбуту"
+
+#: dialogs/classoptionspage.cpp:108
+#, fuzzy
+msgid "Draw as circle"
+msgstr "Маляваць як акружнасць"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Display"
+msgstr "Адлюстраванне"
+
+#: dialogs/classpropdlg.cpp:118
+#, fuzzy
+msgid "Display Options"
+msgstr "Параметры адлюстравання"
+
+#: dialogs/classpropdlg.cpp:179
+#, fuzzy
+msgid "Attribute Settings"
+msgstr "Атрыбуты"
+
+#: dialogs/classpropdlg.cpp:187
+#, fuzzy
+msgid "Operation Settings"
+msgstr "Аперацыі"
+
+#: dialogs/classpropdlg.cpp:195
+#, fuzzy
+msgid "Templates Settings"
+msgstr "Шаблоны"
+
+#: dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals Settings"
+msgstr "Канфігурацыя якія пералічваюцца канстант"
+
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "Атрыбуты сутнасці"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Ёмістасць"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents Settings"
+msgstr "Утрыманне"
+
+#: dialogs/classpropdlg.cpp:222
+#, fuzzy
+msgid "Class Associations"
+msgstr "Класавыя асацыяцыі"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#, fuzzy
+msgid "new_class"
+msgstr "new_class"
+
+#: dialogs/classwizard.cpp:54
+#, fuzzy
+msgid "New Class"
+msgstr "Новы клас"
+
+#: dialogs/classwizard.cpp:59
+#, fuzzy
+msgid "Class Attributes"
+msgstr "Класавыя атрыбуты"
+
+#: dialogs/classwizard.cpp:63
+#, fuzzy
+msgid "Class Operations"
+msgstr "Аперацыі класа"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, fuzzy, no-c-format
 msgid "Code Generation Options"
 msgstr "Параметры генеравання кода"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "Мова"
+#: dialogs/codegenerationwizard.cpp:70
+#, fuzzy
+msgid "&Generate"
+msgstr "Генераваць"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, fuzzy, no-c-format
-msgid "Folders"
-msgstr "Тэчкі"
+#: dialogs/codegenerationwizard.cpp:120
+#, fuzzy
+msgid "Finish"
+msgstr "Гатова"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, fuzzy, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Захоўваць згенераваныя файлы ў тэчку:"
+#: dialogs/codegenerationwizard.cpp:132
+#, fuzzy
+msgid "Code Generated"
+msgstr "Код згенераваны"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, fuzzy, no-c-format
-msgid "Bro&wse..."
-msgstr "Агляд..."
+#: dialogs/codegenerationwizard.cpp:134
+#, fuzzy
+msgid "Not Generated"
+msgstr "Не згенераваны"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, fuzzy, no-c-format
-msgid "B&rowse..."
-msgstr "Агляд..."
+#: dialogs/codegenerationwizard.cpp:141
+#, fuzzy
+msgid "Not Yet Generated"
+msgstr "Яшчэ не згенераваны"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, fuzzy, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "Падлучаць загалоўкавыя файлы з тэчкі:"
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Тэчка %1 не існуе. Стварыць яе?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, fuzzy, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Згенераваныя файлы будуць захаваныя ў гэтай тэчцы"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Тэчка высновы не існуе"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, fuzzy, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Стварыць тэчку"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "Не ствараць"
+
+#: dialogs/codegenerationwizard.cpp:168
+#, fuzzy
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Файлы з гэтай тэчкі будуць выкарыстоўвацца як загалоўкавыя пры генераванні кода"
+"Немагчыма стварыць тэчку.\n"
+"Упэўніцеся, што ў вас ёсць правы на запіс на бацькоўскай тэчцы або вылучыце "
+"іншую тэчку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, fuzzy, no-c-format
-msgid "Overwrite Policy"
-msgstr "Наяўныя файлы"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Памылка стварэння тэчкі"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, fuzzy, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "Вылучыце дапушчальную тэчку."
+
+#: dialogs/codegenerationwizard.cpp:184
+#, fuzzy
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Калі файл з імем, якое будзе скарыстана\n"
-"генератарам кода, ужо існуе:"
+"Канчатковая тэчка існуе, але ў вас адсутнічаюць правы на запіс у яе.\n"
+"Зменіце правы або тэчку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, fuzzy, no-c-format
-msgid "O&verwrite"
-msgstr "Замяняць"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "Памылка запісу ў тэчку высновы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, fuzzy, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Замяняць наяўныя файлы"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 не з'яўляецца тэчкай. Вылучыце іншую тэчку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, fuzzy, no-c-format
-msgid "As&k"
-msgstr "Спытаць"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "Вылучыце дапушчальную тэчку"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, fuzzy, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Калі файл з такім імем ужо існуе, спытаць аб далейшых дзеяннях"
+msgid "Code Viewer"
+msgstr "Прагляд кода"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, fuzzy, no-c-format
-msgid "&Use a different name"
-msgstr "Вылучыць іншае імя"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+#, fuzzy
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Няма даступных параметраў.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, fuzzy, 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/diagramprintpage.cpp:35
+#, fuzzy
+msgid "&Diagrams"
+msgstr "Дыяграмы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, fuzzy, no-c-format
-msgid "Formatting"
-msgstr "Афармленне"
+#: dialogs/diagramprintpage.cpp:40
+#, fuzzy
+msgid "Filter"
+msgstr "Фільтр"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, fuzzy, no-c-format
-msgid "Lines"
-msgstr "Радкі"
+#: dialogs/diagramprintpage.cpp:48
+#, fuzzy
+msgid "&Current diagram"
+msgstr "Бягучая дыяграма"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
-msgstr "Канец радка:"
+#: dialogs/diagramprintpage.cpp:53
+#, fuzzy
+msgid "&All diagrams"
+msgstr "Усе дыяграмы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, fuzzy, no-c-format
-msgid "Indentation type:"
-msgstr "Тып водступаў:"
+#: dialogs/diagramprintpage.cpp:57
+#, fuzzy
+msgid "&Select diagrams"
+msgstr "Вылучыць дыяграмы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, fuzzy, no-c-format
-msgid "Indentation amount:"
-msgstr "Колькасць знакаў:"
+#: dialogs/diagramprintpage.cpp:61
+#, fuzzy
+msgid "&Type of diagram"
+msgstr "Тып дыяграмы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+#, fuzzy
+msgid "Selection"
+msgstr "Вылучэнне"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+#, fuzzy
+msgid "Use Case"
+msgstr "Прэцэдэнт"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+#, fuzzy
+msgid "Collaboration"
+msgstr "Кааперацыя"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+#, fuzzy
+msgid "Sequence"
+msgstr "Паслядоўнасць"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+#, fuzzy
+msgid "State"
+msgstr "Стан"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#, fuzzy
+msgid "Component"
+msgstr "Кампанент"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "Разгортванне"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+#, fuzzy
+msgid "No diagrams selected."
+msgstr "Няма вылучаных дыяграм."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
-"Unix (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "Нататка"
+
+#: dialogs/overwritedialogue.cpp:27
+#, fuzzy
+msgid "Destination File Already Exists"
+msgstr "Канчатковы файл ужо існуе"
+
+#: dialogs/overwritedialogue.cpp:31
+#, fuzzy
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Файл %1 ужо існуе ў %2.\n"
+"\n"
+"Вы можаце замяніць яго, захаваць файл пад іншым імем, або не генераваць яго "
+"наогул."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, fuzzy, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+#, fuzzy
+msgid "&Apply to all remaining files"
+msgstr "Дастасаваць да астатнім файлам"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, fuzzy, no-c-format
-msgid "No Indentation"
-msgstr "Без водступаў"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+#, fuzzy
+msgid "&Overwrite"
+msgstr "Замяніць"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, fuzzy, no-c-format
-msgid "Tab"
-msgstr "Табуляцыя"
+#: dialogs/overwritedialogue.cpp:39
+#, fuzzy
+msgid "&Generate Similar File Name"
+msgstr "Прапанаваць падобнае імя"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, fuzzy, no-c-format
-msgid "Space"
-msgstr "Прабел"
+#: dialogs/overwritedialogue.cpp:40
+#, fuzzy
+msgid "&Do Not Generate File"
+msgstr "Не генераваць файл"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, fuzzy, no-c-format
-msgid "Comment Verbosity"
-msgstr "Падрабязнасць каментароў"
+#: dialogs/parmpropdlg.cpp:35
+#, fuzzy
+msgid "Parameter Properties"
+msgstr "Уласцівасці параметру"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, fuzzy, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "Устаўляць каментары для секцый нават калі яны пустыя"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+#, fuzzy
+msgid "&Type:"
+msgstr "Тып:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, fuzzy, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+#, fuzzy
+msgid "&Name:"
+msgstr "Імя:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+#, fuzzy
+msgid "&Initial value:"
+msgstr "Пачатковае значэнне:"
+
+#: dialogs/parmpropdlg.cpp:82
+#, fuzzy
+msgid "Passing Direction"
+msgstr "Кірунак перадачы"
+
+#: dialogs/parmpropdlg.cpp:84
+#, fuzzy
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Устаўляць каментары з назовамі секцый (адчыненыя, прыватныя...) у азначэнні "
-"класа нават калі няма элементаў у гэтых секцыях"
+"\"in\" - параметр толькі для чытання, \"out\" - параметр толькі для запісу і "
+"\"inout\" - параметр як для чытання, так і для запісу."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Устаўляць каментары ў дакументацыю нават калі яны пустыя"
+#: dialogs/pkgcontentspage.cpp:29
+#, fuzzy
+msgid "Contained Items"
+msgstr "Змесціва"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Устаўляць каментары для класаў і метадаў нават калі яны пустыя"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+#, fuzzy
+msgid "Select Operation"
+msgstr "Вылучыце аперацыю"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Language Options"
-msgstr "Мовы праграмавання"
+#: dialogs/selectopdlg.cpp:43
+#, fuzzy
+msgid "Sequence number:"
+msgstr "Нумар прытрымлівання:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Майстар генеравання кода"
+#: dialogs/selectopdlg.cpp:46
+#, fuzzy
+msgid "Class operation:"
+msgstr "Класавая аперацыя:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Select Classes"
-msgstr "Вылучыце класы"
+#: dialogs/selectopdlg.cpp:54
+#, fuzzy
+msgid "Custom operation:"
+msgstr "Іншае дзеянне:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, fuzzy, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+#: dialogs/settingsdlg.cpp:30
+#, fuzzy
+msgid "Umbrello Setup"
+msgstr "Налада Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface"
+msgstr "Інтэрфейс"
+
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface Settings"
+msgstr "Карыстацкі інтэрфейс"
+
+#: dialogs/settingsdlg.cpp:54
+#, fuzzy
+msgid "Line color:"
+msgstr "Колер лініі:"
+
+#: dialogs/settingsdlg.cpp:60
+#, fuzzy
+msgid "D&efault Color"
+msgstr "Колер па змаўчанні"
+
+#: dialogs/settingsdlg.cpp:63
+#, fuzzy
+msgid "Fill color:"
+msgstr "Колер фону:"
+
+#: dialogs/settingsdlg.cpp:69
+#, fuzzy
+msgid "De&fault Color"
+msgstr "Колер па змаўчанні"
+
+#: dialogs/settingsdlg.cpp:73
+#, fuzzy
+msgid "Line width:"
+msgstr "Шырыня радка:"
+
+#: dialogs/settingsdlg.cpp:81
+#, fuzzy
+msgid "D&efault Width"
+msgstr "Шырыня па змаўчанні"
+
+#: dialogs/settingsdlg.cpp:86
+#, fuzzy
+msgid "&Use fill color"
+msgstr "Непразрысты фон"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Змесціце класы, для якіх вы жадаеце згенераваць код,\n"
-"у спіс справа"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, fuzzy, no-c-format
-msgid "Add class for code generation"
-msgstr "Дадаць клас для генеравання кода"
+#: dialogs/settingsdlg.cpp:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "Уключыць запіс дзеянняў для адмены"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, fuzzy, no-c-format
-msgid "Classes Selected"
-msgstr "Вылучаныя класы"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "Выкарыстаць укладкі"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, fuzzy, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Выдаліць клас з генерацыі кода"
+#: dialogs/settingsdlg.cpp:116
+#, fuzzy
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Выкарыстаць новыя генератары класаў C++, Java і Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, fuzzy, no-c-format
-msgid "Classes Available"
-msgstr "Даступныя класы"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Вобласць бачнасці палёў асацыяцыі па змаўчанні:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, fuzzy, no-c-format
-msgid "Code Generation Status"
-msgstr "Стан генеравання кода"
+#: dialogs/settingsdlg.cpp:126
+#, fuzzy
+msgid "Autosave"
+msgstr "Аўтазахаванне"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Націсніце кнопку для запуску генерацыі кода"
+#: dialogs/settingsdlg.cpp:132
+#, fuzzy
+msgid "E&nable autosave"
+msgstr "Уключыць аўтазахаванне"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Generation Status"
-msgstr "Стан генеравання"
+#: dialogs/settingsdlg.cpp:136
+#, fuzzy
+msgid "Select auto-save time interval (mins):"
+msgstr "Інтэрвал аўтазахавання, мін:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "Прагляд кода"
+#: dialogs/settingsdlg.cpp:146
+#, fuzzy
+msgid "Set autosave suffix:"
+msgstr "Пашырэнне аўтазахавання:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, fuzzy, no-c-format
-msgid "Show hidden blocks"
-msgstr "Адлюстроўваць утоеныя блокі"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">тут імя кампанента</p>"
+#: dialogs/settingsdlg.cpp:158
+#, fuzzy
+msgid "Startup"
+msgstr "Запуск прыкладання"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, fuzzy, no-c-format
-msgid "Show block type"
-msgstr "Адлюстроўваць тып блока"
+#: dialogs/settingsdlg.cpp:164
+#, fuzzy
+msgid "Sta&rtup logo"
+msgstr "Паказваць застаўку"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, fuzzy, no-c-format
-msgid "Colors"
-msgstr "Колеры"
+#: dialogs/settingsdlg.cpp:168
+#, fuzzy
+msgid "&Tip of the day"
+msgstr "Рада дня"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, fuzzy, no-c-format
-msgid "Font:"
-msgstr "Шрыфт:"
+#: dialogs/settingsdlg.cpp:172
+#, fuzzy
+msgid "&Load last project"
+msgstr "Адкрыць апошні праект"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, fuzzy, no-c-format
-msgid "Paper:"
-msgstr "Папера:"
+#: dialogs/settingsdlg.cpp:176
+#, fuzzy
+msgid "Start new project with:"
+msgstr "Дыяграма па змаўчанні для новага праекту:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, fuzzy, no-c-format
-msgid "Selected:"
-msgstr "Вылучэнне:"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "No Diagram"
+msgstr "Пусты"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Блок аб'екта UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "Class Diagram"
+msgstr "Дыяграма класа"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Утоены блок:</p>"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Use Case Diagram"
+msgstr "Дыяграма прэцэдэнтаў"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Нязменлівы тэкст:</p>"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Sequence Diagram"
+msgstr "Дыяграма паслядоўнасцяў"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Змяняны тэкст:</p>"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "Collaboration Diagram"
+msgstr "Дыяграма кааперацыі"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, fuzzy, no-c-format
-msgid "Diagram Properties"
-msgstr "Параметры дыяграмы"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "State Diagram"
+msgstr "Дыяграма станаў"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, fuzzy, no-c-format
-msgid "Name:"
-msgstr "Імя:"
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Activity Diagram"
+msgstr "Дыяграма дзейнасці"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Zoom:"
-msgstr "Маштаб:"
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Component Diagram"
+msgstr "Дыяграма кампанентаў"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+#, fuzzy
+msgid "Deployment Diagram"
+msgstr "Дыяграма разгорткі"
+
+#: dialogs/settingsdlg.cpp:210
+#, fuzzy
+msgid "Class Settings"
+msgstr "Параметры класа"
+
+#: dialogs/settingsdlg.cpp:217
+#, fuzzy
+msgid "Show &visibility"
+msgstr "Паказаць бачнасць"
+
+#: dialogs/settingsdlg.cpp:221
+#, fuzzy
+msgid "Show attributes"
+msgstr "Паказаць атрыбуты"
+
+#: dialogs/settingsdlg.cpp:225
+#, fuzzy
+msgid "Show operations"
+msgstr "Паказаць аперацыі"
+
+#: dialogs/settingsdlg.cpp:229
+#, fuzzy
+msgid "Show stereot&ype"
+msgstr "Паказаць стэрэатып"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:233
+#, fuzzy
+msgid "Show attribute signature"
+msgstr "Паказаць сігнатуру атрыбуту"
+
+#: dialogs/settingsdlg.cpp:238
+#, fuzzy
+msgid "Show package"
+msgstr "Паказаць пакет"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
 msgid "Show operation signature"
 msgstr "Паказаць сігнатуру аперацыі"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, fuzzy, no-c-format
-msgid "Show &grid"
-msgstr "Сетка"
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr "Пачатковая вобласць бачнасці"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, fuzzy, no-c-format
-msgid "Snap &to grid"
-msgstr "Прывязаць да сеткі"
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "Вобласць бачнасці атрыбутаў па змаўчанні"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "Прывязаць памер кампанентаў"
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "Вобласць бачнасці аперацый па змаўчанні"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, fuzzy, no-c-format
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation"
+msgstr "Генераванне кода"
+
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation Settings"
+msgstr "Генераванне кода"
+
+#: dialogs/settingsdlg.cpp:301
+#, fuzzy
+msgid "Code Viewer Settings"
+msgstr "Прагляд кода"
+
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "Initial state"
+msgstr "Пачатковы стан"
+
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "End state"
+msgstr "Канчатковы стан"
+
+#: dialogs/statedialog.cpp:96
+#, fuzzy
+msgid "State type:"
+msgstr "Тып стану:"
+
+#: dialogs/statedialog.cpp:101
+#, fuzzy
+msgid "State name:"
+msgstr "Імя стану:"
+
+#: dialogs/statedialog.cpp:130
+#, fuzzy
+msgid "Widget Color"
+msgstr "Колер элемента"
+
+#: dialogs/umlattributedialog.cpp:42
+#, fuzzy
+msgid "Attribute Properties"
+msgstr "Уласцівасці атрыбуту"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+#, fuzzy
+msgid "Classifier &scope (\"static\")"
+msgstr "Вобласць бачнасці класіфікатара (\"static\")"
+
+#: dialogs/umlattributedialog.cpp:91
+#, fuzzy
+msgid "&Public"
+msgstr "Публічны"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+#, fuzzy
+msgid "Prot&ected"
+msgstr "Абаронены"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "Рэалізацыя"
+
+#: dialogs/umlattributedialog.cpp:155
+#, fuzzy
+msgid "You have entered an invalid attribute name."
+msgstr "Вы ўвялі недапушчальнае імя атрыбуту."
+
+#: dialogs/umlattributedialog.cpp:156
+#, fuzzy
+msgid "Attribute Name Invalid"
+msgstr "Імя атрыбуту недапушчальна"
+
+#: dialogs/umlattributedialog.cpp:163
+#, fuzzy
 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 ""
-"Прывязаць памер кампанентаў да кроку сеткі.\n"
-"Калі ўключаны параметр \"Прывязаць да сеткі\", усе чатыры боку кампанента "
-"будуць размяшчацца па сетцы."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Такое імя атрыбуту ўжо выкарыстоўваецца."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, fuzzy, no-c-format
-msgid "Grid spacing:  "
-msgstr "Інтэрвал сеткі:  "
+#: dialogs/umlattributedialog.cpp:164
+#, fuzzy
+msgid "Attribute Name Not Unique"
+msgstr "Імя атрыбуту ўжо выкарыстоўваецца"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, fuzzy, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
+msgstr "Уласцівасці атрыбуту сутнасці"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, fuzzy, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "Значэнне па змаўчанні:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, fuzzy, no-c-format
-msgid "Line width:  "
-msgstr "Шырыня радка:  "
+#: dialogs/umlentityattributedialog.cpp:81
+#, fuzzy
+msgid "Length/Values:"
+msgstr "Даўжыня/Значэнні:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Захаваць як малюнак..."
+#: dialogs/umlentityattributedialog.cpp:84
+#, fuzzy
+msgid "&Auto increment"
+msgstr "Аўта-інкрымент"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:88
+#, fuzzy
+msgid "Allow &null"
+msgstr "Дазволіць null"
 
-#. 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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "Атрыбуты:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Тып стану:"
+#: dialogs/umlentityattributedialog.cpp:108
+#, fuzzy
+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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "Адключана"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "Тэчка"
+#: dialogs/umlentityattributedialog.cpp:115
+#, fuzzy
+msgid "&Primary"
+msgstr "Першаснае"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+#, fuzzy
+msgid "&Index"
+msgstr "Індэкс"
+
+#: dialogs/umlentityattributedialog.cpp:121
+#, fuzzy
+msgid "&Unique"
+msgstr "Унікальнае"
+
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+msgstr "Вы ўвялі недапушчальнае імя атрыбуту сутнасці."
+
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "Імя атрыбуту сутнасці недапушчальна"
+
+#: dialogs/umlentityattributedialog.cpp:192
+#, fuzzy
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+"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
+#, fuzzy
+msgid "Entity Attribute Name Not Unique"
+msgstr "Імя атрыбуту сутнасці ўжо выкарыстоўваецца"
+
+#: dialogs/umloperationdialog.cpp:50
+#, fuzzy
+msgid "Operation Properties"
+msgstr "Уласцівасці аперацыі"
+
+#: dialogs/umloperationdialog.cpp:89
+#, fuzzy
+msgid "&Abstract operation"
+msgstr "Абстрактная аперацыя"
+
+#: dialogs/umloperationdialog.cpp:95
+#, fuzzy
+msgid "&Query (\"const\")"
+msgstr "Запыт (\"const\")"
+
+#: dialogs/umloperationdialog.cpp:120
+#, fuzzy
+msgid "Parameters"
+msgstr "Параметры"
+
+#: dialogs/umloperationdialog.cpp:141
+#, fuzzy
+msgid "Ne&w Parameter..."
+msgstr "Стварыць параметр..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+#, fuzzy
+msgid "You have entered an invalid parameter name."
+msgstr "Няправільнае імя параметру."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+#, fuzzy
+msgid "Parameter Name Invalid"
+msgstr "Няправільнае імя параметру"
+
+#: dialogs/umloperationdialog.cpp:339
+#, fuzzy
 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 ""
+"Вылучанае імя параметру ўжо\n"
+"выкарыстоўваецца ў гэтай аперацыі."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+#, fuzzy
+msgid "Parameter Name Not Unique"
+msgstr "Імя параметру не ўнікальна"
+
+#: dialogs/umloperationdialog.cpp:406
+#, fuzzy
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Паказанае імя параметру ўжо выкарыстоўваецца ў гэтай аперацыі."
+
+#: dialogs/umloperationdialog.cpp:456
+#, fuzzy
+msgid "You have entered an invalid operation name."
+msgstr "Недапушчальнае імя аперацыі."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+#, fuzzy
+msgid "Operation Name Invalid"
+msgstr "Недапушчальнае імя аперацыі"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#, fuzzy
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Аперацыя з такой жа сігнатурай ужо існуе ў %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+#, fuzzy
+msgid "Choose a different name or parameter list."
+msgstr "Вылучыце іншае імя або набор параметраў."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, fuzzy, no-c-format
 msgid "Role Properties"
 msgstr "Уласцівасці роляў"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, fuzzy, no-c-format
-msgid "Rolename:"
-msgstr "Імя ролі:"
+#: dialogs/umltemplatedialog.cpp:36
+#, fuzzy
+msgid "Template Properties"
+msgstr "Уласцівасці шаблону"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, fuzzy, no-c-format
-msgid "Multiplicity:"
-msgstr "Множнасць:"
+#: dialogs/umltemplatedialog.cpp:128
+#, fuzzy
+msgid "You have entered an invalid template name."
+msgstr "Няслушнае імя шаблону."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, fuzzy, no-c-format
-msgid "Role Changeability"
-msgstr "Магчымасць змены ролі"
+#: dialogs/umltemplatedialog.cpp:129
+#, fuzzy
+msgid "Template Name Invalid"
+msgstr "Няслушнае імя шаблону"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, fuzzy, no-c-format
-msgid "Add only"
-msgstr "Толькі даданне"
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Паказанае імя параметру шаблону ўжо выкарыстоўваецца ў гэтай аперацыі."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, fuzzy, no-c-format
-msgid "Frozen"
-msgstr "Не"
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "Імя параметру шаблону не ўнікальна"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, fuzzy, no-c-format
-msgid "Changeable"
-msgstr "Магчымасць змены"
+#: dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Classes Display Options"
+msgstr "Параметры адлюстравання класаў"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, fuzzy, no-c-format
-msgid "Role Visibility"
-msgstr "Бачнасць ролі"
+#: dialogs/umlviewdialog.cpp:100
+#, fuzzy
+msgid "Diagram Colors"
+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 "Рэалізацыя"
+#: dialogs/umlviewdialog.cpp:164
+#, fuzzy
+msgid "The name you have entered is invalid."
+msgstr "Паказана няправільнае імя."
 
-#: tips.txt:3
+#: dialogs/umlviewdialog.cpp:170
 #, fuzzy
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Сардэчна запрашаем у Umbrello.</p>\n"
-"<p>З дапамогай UML-дыяграм вы зможаце спраектаваць і дакументаваць "
-"аб'ектна-арыентаванае програмное забеспячэнне.  <a href=\"help:/umbrello\">"
-"Кіраўніцтва Umbrello</a> таксама ўтрымоўвае кароткія ўводзіны ў UML.</p>\n"
+msgid "The name you have entered is not unique."
+msgstr "Такое імя ўжо існуе."
 
-#: tips.txt:9
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
 #, fuzzy
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Сардэчна запрашаем у 1.5.  У гэтай версіі дададзеная падтрымка асацыяцый, "
-"генератар кода Ruby, магчымасць ператвараць інтэрфейсы ў класы і не толькі.</p>"
-"\n"
+msgid "Name Not Unique"
+msgstr "Імя існуе"
 
-#: tips.txt:14
+#: dialogs/umlwidgetcolorpage.cpp:58
 #, fuzzy
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Немагчыма адначасова выкарыстаць дыяграмы ва ўкладках і знешнія тэчкі. Калі "
-"вы жадаеце выкарыстаць знешнія тэчкі, адключыце параметр \"Выкарыстаць "
-"укладкі\".</p>\n"
+msgid "&Line:"
+msgstr "Лінія:"
 
-#: tips.txt:19
+#: dialogs/umlwidgetcolorpage.cpp:68
 #, fuzzy
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Памер большасці элементаў дыяграм нельга змяніць уручную, гэта будзе "
-"адбывацца аўтаматычна пры неабходнасці каб змясціць утрыманне.\n"
-"Памер блокаў, нататак і паведамленняў дыяграм паслядоўнасцяў змяніць можна, з "
-"дапамогай чырвонага квадраціка.</p>\n"
+msgid "&Fill:"
+msgstr "Фон:"
 
-#: tips.txt:25
+#: dialogs/umlwidgetcolorpage.cpp:75
 #, fuzzy
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Калі вы жадаеце дадаць наяўны клас у дыяграму, проста перанясіце яго з дрэва "
-"класаў злева.</p>\n"
+msgid "D&efault"
+msgstr "Па змаўчанні"
 
-#: tips.txt:30
+#: dialogs/umlwidgetcolorpage.cpp:78
 #, fuzzy
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Утыліта рэарганізацыі дазваляе вам перамяшчаць аперацыі паміж класамі і іх "
-"нашчадкамі/бацькамі.\n"
-"Яе можна выклікаць з кантэкстнага меню класа.</p>\n"
+msgid "&Use fill"
+msgstr "Непразрысты фон"
 
-#: tips.txt:37
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
 #, fuzzy
-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"
+msgid "Exporting all views..."
+msgstr "Захаваць як малюнак..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p>Аб'екты дыяграм паслядоўнасці могуць мець блок дэструктара і малявацца ў "
-"выглядзе дзеючых твараў. Падвойная пстрычка прывядзе да адкрыцця "
-"ўласцівасцяў.</p>\n"
 
-#: tips.txt:43
+#: 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
+#, fuzzy, c-format
+msgid "There was a problem saving file: %1"
+msgstr "Памылка пры захаванні файла: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
 #, fuzzy
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Паведамленні дыяграмы паслядоўнасцяў могуць выконваць ролю канструктараў. "
-"Пстрыкніце на аб'екце каб зрабіць яго канструктарам.</p>\n"
+msgid "Save Error"
+msgstr "Памылка захавання"
 
-#: tips.txt:48
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
 #, fuzzy
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Дыяграмы паслядоўнасцяў падтрымліваюць пасылку паведамленняў самім сабе. "
-"Пстрыкніце на той жа вертыкальнай лініі каб стварыць аўтапаведамленне.</p>\n"
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Аўтары Umbrello"
 
-#: tips.txt:53
+#: docgenerators/main.cpp:47
 #, fuzzy
-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"
+msgid "File to transform"
+msgstr "Адкрыць файл"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>Калі пры загрузцы знешняга файла спіс пусты, \n"
-"паспрабуйце захаваць мадэль пад іншым імем, \n"
-"зачыніце і паспрабуйце зноў адкрыць захаваны файл.\n"
-"</p>\n"
 
-#: tips.txt:60
+#: docgenerators/main.cpp:64
 #, fuzzy
 msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Пры капіяванні або выразанні ў буфер абмену таксама капіюецца PNG-малюнак "
-"дыяграмы, якое можна ўставіць у KWord і іншыя прыкладанні.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 Паўль Хенсген (Paul Hensgen), (c) 2002-2006 Аўтары Umbrello"
 
-#: tips.txt:66
+#: docgenerators/main.cpp:67 main.cpp:98
 #, fuzzy
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Асацыяцыі не абавязкова павінны быць прамымі лініямі. Пстрыкніце на ёй і "
-"створыцца перасоўваная кропка.</p>\n"
+msgid "Umbrello UML Modeller Authors"
+msgstr "Аўтары Umbrello"
 
-#: tips.txt:71
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
 #, fuzzy
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Вы можаце ўключыць аўтазахаванне ў наладах Umbrello.</p>\n"
+msgid "Name"
+msgstr "Імя"
 
-#: tips.txt:76
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
 #, fuzzy
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Вам чагосьці бракуе ў  Umbrello? Дайце нам ведаць аб гэтым. \n"
-"Паведаміце аб ім праз сістэму адсочвання памылак (\"Паведаміць аб памылцы\" у "
-"меню \"Даведка\", або праз спіс рассылання uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+msgid "Enter name:"
+msgstr "Увядзіце імя:"
 
-#: tips.txt:86
+#: floatingtextwidget.cpp:112
 #, fuzzy
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Вы можаце выдаліць усе вылучаныя аб'екты націскам Del або Backspace.</p>\n"
+msgid "Enter operation name:"
+msgstr "Увядзіце імя аперацыі:"
 
-#: tips.txt:91
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
 #, fuzzy
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Калі вы выявілі памылку ў Umbrello, паведаміце нам аб ёй. \n"
-"Для гэтага можаце скарыстацца адпаведным пунктам у меню Даведка.</p>\n"
+msgid "Enter new text:"
+msgstr "Увядзіце новы тэкст:"
 
-#: tips.txt:97
+#: floatingtextwidget.cpp:175
 #, fuzzy
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Пры націску Escape актывуецца сродак вылучэння.\n"
-"А пры націску Backspace актывуецца сродак, якое выкарыстоўвалася да гэтага.</p>"
-"\n"
+msgid "ERROR"
+msgstr "ПАМЫЛКА"
 
-#: tips.txt:103
+#: floatingtextwidget.cpp:264
 #, fuzzy
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Каб вылучыць усе аб'екты, націсніце Ctrl-A.</p>\n"
+msgid "Change Text"
+msgstr "Змяніць тэкст"
 
-#: tips.txt:108
+#: folder.cpp:289
 #, fuzzy
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Вы можаце стварыць новы клас з дапамогай майстра новых класаў у меню Код.</p>"
-"\n"
+msgid "The folderfile %1 does not exist."
+msgstr "Файл тэчкі %1 не існуе."
+
+#: 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
+#, fuzzy
+msgid "Load Error"
+msgstr "Памылка загрузкі"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Не атрымалася адкрыць файл тэчкі %1."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 #, fuzzy
@@ -1825,6 +2158,10 @@ msgstr "Новая аперацыя..."
 msgid "Select Operation..."
 msgstr "Вылучыць аперацыю..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 #, fuzzy
 msgid "Change Text..."
@@ -1886,6 +2223,19 @@ msgstr "Стварыць"
 msgid "Rename..."
 msgstr "Пераназваць..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Памылка ўстаўкі"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 #, fuzzy
 msgid "Line Color..."
@@ -1921,15 +2271,30 @@ msgstr "Зрабіць тэчку ўнутранай"
 msgid "Import Classes..."
 msgstr "Імпартаваць класы..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+#, fuzzy
+msgid "Package"
+msgstr "Пакет"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#, fuzzy
+msgid "Artifact"
+msgstr "Артэфакт"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
 msgid "Component Diagram..."
 msgstr "Дыяграма кампанентаў..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#, fuzzy
+msgid "Node"
+msgstr "Вузел"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 #, fuzzy
 msgid "Deployment Diagram..."
@@ -1940,11 +2305,21 @@ msgstr "Дыяграма разгортвання..."
 msgid "Folder"
 msgstr "Тэчка"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Сутнасць"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Дыяграма адносін сутнасцяў..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+#, fuzzy
+msgid "Actor"
+msgstr "Дзеючы твар"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 #, fuzzy
 msgid "Use Case Diagram..."
@@ -1990,6 +2365,21 @@ msgstr "Новы атрыбут сутнасці..."
 msgid "Export as Picture..."
 msgstr "Захаваць як малюнак..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+#, fuzzy
+msgid "Interface"
+msgstr "Інтэрфейс"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+#, fuzzy
+msgid "Datatype"
+msgstr "Тып дадзеных"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#, fuzzy
+msgid "Enum"
+msgstr "Які пералічваецца тып"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
 msgid "Class Diagram..."
@@ -2015,30 +2405,11 @@ msgstr "Дыяграма паслядоўнасцяў..."
 msgid "Collaboration Diagram..."
 msgstr "Дыяграма кааперацыі..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-#, fuzzy
-msgid "Attributes"
-msgstr "Атрыбуты"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-#, fuzzy
-msgid "Operations"
-msgstr "Аперацыі"
-
 #: listpopupmenu.cpp:676
 #, fuzzy
 msgid "Public Only"
 msgstr "Толькі публічны"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-#, fuzzy
-msgid "Visibility"
-msgstr "Бачнасць"
-
 #: listpopupmenu.cpp:680
 #, fuzzy
 msgid "Operation Signature"
@@ -2054,12 +2425,6 @@ msgstr "Сігнатура атрыбуту"
 msgid "Stereotype"
 msgstr "Стэрэатып"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-#, fuzzy
-msgid "Show"
-msgstr "Паказаць"
-
 #: listpopupmenu.cpp:707
 #, fuzzy
 msgid "Attribute..."
@@ -2090,15 +2455,6 @@ msgstr "Колер фону..."
 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
-#, fuzzy
-msgid "Color"
-msgstr "Колер"
-
 #: listpopupmenu.cpp:1007
 #, fuzzy
 msgid "Actor..."
@@ -2134,11 +2490,31 @@ msgstr "Які пералічваецца тып..."
 msgid "Package..."
 msgstr "Пакет..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#, fuzzy
+msgid "Initial State"
+msgstr "Пачатковы стан"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#, fuzzy
+msgid "End State"
+msgstr "Канчатковы стан"
+
 #: listpopupmenu.cpp:1032
 #, fuzzy
 msgid "State..."
 msgstr "Стан..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#, fuzzy
+msgid "Initial Activity"
+msgstr "Пачатковая дзейнасць"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#, fuzzy
+msgid "End Activity"
+msgstr "Канчатковая дзейнасць"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -2194,6 +2570,14 @@ msgstr "Выдаліць спасылку"
 msgid "Change Association Name..."
 msgstr "Змяніць імя асацыяцыі..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 #, fuzzy
 msgid "Clear Diagram"
@@ -2234,8 +2618,8 @@ 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
@@ -2243,219 +2627,115 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(c) 2001 Паўль Хенсген (Paul Hensgen), (c) 2002-2006 Аўтары Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-#, fuzzy
-msgid "Incorrect use of associations."
-msgstr "Недапушчальнае выкарыстанне асацыяцый."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-#, fuzzy
-msgid "Association Error"
-msgstr "Памылка асацыяцыі"
-
-#: folder.cpp:289
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Файл тэчкі %1 не існуе."
-
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Не атрымалася адкрыць файл тэчкі %1."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Сяржук Лянцэвіч"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "serzh.by@gmail.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
-#, fuzzy
-msgid "Ready."
-msgstr "Гатова."
-
-#: 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
-#, fuzzy
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Вобласць бачнасці %1 абмяжоўваецца прасторай імёнаў або класам?"
-
-#: codeimport/import_utils.cpp:182
-#, fuzzy
-msgid "C++ Import Requests Your Help"
-msgstr "Імпарт у C++ патрабуе вашага ўмяшання"
-
-#: codeimport/import_utils.cpp:183
-#, fuzzy
-msgid "Namespace"
-msgstr "Прастора імёнаў"
-
-#: codeimport/classimport.cpp:34
-#, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Імпартаванне файла: %1 Выканана: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-#, fuzzy
-msgid "Internal Error"
-msgstr "Унутраная памылка"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-#, fuzzy
-msgid "Syntax Error before '%1'"
-msgstr "Сінтаксічная памылка перад '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-#, fuzzy
-msgid "Parse Error before '%1'"
-msgstr "Памылка граматычнага разбору перад '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
+#: model_utils.cpp:244
 #, fuzzy
-msgid "<eof>"
-msgstr "<eof>"
+msgid "new_actor"
+msgstr "new_actor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
+#: model_utils.cpp:246
 #, fuzzy
-msgid "expression expected"
-msgstr "чакаецца выраз"
+msgid "new_usecase"
+msgstr "new_usecase"
 
-#: codeimport/kdevcppparser/parser.cpp:598
+#: model_utils.cpp:248
 #, fuzzy
-msgid "Declaration syntax error"
-msgstr "Памылка ў сінтаксісе аб'явы"
+msgid "new_package"
+msgstr "new_package"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
+#: model_utils.cpp:250
 #, fuzzy
-msgid "} expected"
-msgstr "} чакалася"
+msgid "new_component"
+msgstr "new_component"
 
-#: codeimport/kdevcppparser/parser.cpp:684
+#: model_utils.cpp:252
 #, fuzzy
-msgid "namespace expected"
-msgstr "прастора імёнаў чакалася"
+msgid "new_node"
+msgstr "new_node"
 
-#: codeimport/kdevcppparser/parser.cpp:688
+#: model_utils.cpp:254
 #, fuzzy
-msgid "{ expected"
-msgstr "{ чакалася"
+msgid "new_artifact"
+msgstr "new_artifact"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
+#: model_utils.cpp:256
 #, fuzzy
-msgid "Namespace name expected"
-msgstr "Чакаецца імя прасторы імёнаў"
+msgid "new_interface"
+msgstr "new_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:869
+#: model_utils.cpp:258
 #, fuzzy
-msgid "Need a type specifier to declare"
-msgstr "Неабходны спеціфікатар тыпу для аб'явы"
+msgid "new_datatype"
+msgstr "new_datatype"
 
-#: codeimport/kdevcppparser/parser.cpp:938
+#: model_utils.cpp:260
 #, fuzzy
-msgid "expected a declaration"
-msgstr "чакаецца аб'ява"
+msgid "new_enum"
+msgstr "new_enum"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
+#: model_utils.cpp:262
 #, fuzzy
-msgid "Constant expression expected"
-msgstr "Чакалася константное выраз"
+msgid "new_entity"
+msgstr "new_entity"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
+#: model_utils.cpp:264
 #, fuzzy
-msgid "')' expected"
-msgstr "')' чакалася"
+msgid "new_folder"
+msgstr "new_node"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
 #, fuzzy
-msgid "} missing"
-msgstr "} прапушчана"
+msgid "new_association"
+msgstr "new_association"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
+#: model_utils.cpp:268
 #, fuzzy
-msgid "Member initializers expected"
-msgstr "Чакаліся ініціалізатары чальцоў"
+msgid "new_object"
+msgstr "new_object"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-#, fuzzy
-msgid "Base class specifier expected"
-msgstr "Чакаўся спеціфікатар базавага класа"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
+#: model_utils.cpp:559
 #, fuzzy
-msgid "Initializer clause expected"
-msgstr "Чакаецца канструкцыя ініцыялізацыі"
+msgid "Empty"
+msgstr "Пуста"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
+#: model_utils.cpp:559
 #, fuzzy
-msgid "Identifier expected"
-msgstr "Чакаецца ідэнтыфікатар"
+msgid "Malformed argument"
+msgstr "Недапушчальны аргумент"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
+#: model_utils.cpp:560
 #, fuzzy
-msgid "Type id expected"
-msgstr "Чакаецца ідэнтыфікатар тыпу"
+msgid "Unknown argument type"
+msgstr "Невядомы тып аргументу"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
+#: model_utils.cpp:560
 #, fuzzy
-msgid "Class name expected"
-msgstr "Чакалася імя класа"
+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
+#: model_utils.cpp:561
 #, fuzzy
-msgid "condition expected"
-msgstr "чакаецца ўмоўны выраз"
+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
+#: model_utils.cpp:561
 #, fuzzy
-msgid "statement expected"
-msgstr "чакаецца выраз"
+msgid "Unspecified error"
+msgstr "Нявызначаная памылка"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
+#: object_factory.cpp:164
 #, fuzzy
-msgid "for initialization expected"
-msgstr "чакаецца ініцыялізацыя for"
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Гэтае зарэзерваванае службовае слова актыўнай мовы."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
+#: object_factory.cpp:165
 #, fuzzy
-msgid "catch expected"
-msgstr "чакаецца catch"
+msgid "Reserved Keyword"
+msgstr "Зарэзерваванае ключавое слова"
 
 #: objectwidget.cpp:90
 #, fuzzy
@@ -2472,126 +2752,80 @@ msgstr "Увядзіце імя аб'екта:"
 msgid "new_parameter"
 msgstr "new_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-#, fuzzy
-msgid "General Options"
-msgstr "Агульныя параметры"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "Пакет з'яўляецца прасторай імёнаў"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-#, fuzzy
-msgid "Virtual destructors"
-msgstr "Віртуальныя дэструктары"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-#, fuzzy
-msgid "Generate empty constructors"
-msgstr "Генераваць пустыя канструктары"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-#, fuzzy
-msgid "Generate accessor methods"
-msgstr "Генераваць метады доступу да атрыбутаў"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-#, fuzzy
-msgid "Operations are inline"
-msgstr "Убудавальныя аперацыі"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-#, fuzzy
-msgid "Accessors are inline"
-msgstr "Убудавальныя метады доступу да атрыбутаў"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-#, fuzzy
-msgid "Accessors are public"
-msgstr "Адчыненыя метады доступу да атрыбутаў"
-
-#: umlview.cpp:297 umlview.cpp:357
-#, fuzzy
-msgid "Diagram: %2 Page %1"
-msgstr "Дыяграма: %2 Старонка %1"
-
-#: umlview.cpp:2578
+#: refactoring/refactoringassistant.cpp:289
 #, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Увядзіце імя дыяграмы"
+msgid "Add Base Class"
+msgstr "Дадаць базавы клас"
 
-#: umlview.cpp:2579
+#: refactoring/refactoringassistant.cpp:290
 #, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "Увядзіце новае імя дыяграмы:"
+msgid "Add Derived Class"
+msgstr "Дадаць наследуючы клас"
 
-#: umlview.cpp:2736
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
 #, fuzzy
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr "Выдаліць дыяграму цалкам?"
+msgid "Add Operation"
+msgstr "Дадаць аперацыю"
 
-#: umlview.cpp:2738
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
 #, fuzzy
-msgid "Delete Diagram?"
-msgstr "Выдаліць дыяграму?"
+msgid "Add Attribute"
+msgstr "Дадаць атрыбут"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+#: refactoring/refactoringassistant.cpp:297
 #, fuzzy
-msgid "Rename canceled"
-msgstr "Пераназванне скасавана"
+msgid "Add Base Interface"
+msgstr "Дадаць базавы інтэрфейс"
 
-#: umllistviewitem.cpp:468
+#: refactoring/refactoringassistant.cpp:298
 #, fuzzy
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Пераназванне запісу тыпу %1 у спісе не падтрымліваецца."
+msgid "Add Derived Interface"
+msgstr "Дадаць наследуючы інтэрфейс"
 
-#: umllistviewitem.cpp:469
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
 #, fuzzy
-msgid "Function Not Implemented"
-msgstr "Функцыя не рэалізаваная"
+msgid "Base Classifiers"
+msgstr "Базавыя класіфікатары"
 
-#: umllistviewitem.cpp:478
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Паказанае імя недапушчальна.\n"
-"Пераназванне скасавана."
+msgid "Derived Classifiers"
+msgstr "Вытворныя класіфікатары"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
 #, fuzzy
-msgid "new_association"
-msgstr "new_association"
+msgid "Enter State Name"
+msgstr "Увядзіце імя стану"
 
-#: umlcanvasobject.cpp:150
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
 #, fuzzy
-msgid "new_attribute"
-msgstr "new_attribute"
+msgid "Enter the name of the new state:"
+msgstr "Увядзіце імя новага стану:"
 
-#: umlcanvasobject.cpp:153
+#: statewidget.cpp:176
 #, fuzzy
-msgid "new_template"
-msgstr "new_template"
+msgid "Enter Activity"
+msgstr "Увядзіце дзейнасць"
 
-#: umlcanvasobject.cpp:156
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_operation"
-msgstr "new_operation"
+msgid "Incorrect use of associations."
+msgstr "Недапушчальнае выкарыстанне асацыяцый."
 
-#: umlcanvasobject.cpp:159
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_literal"
-msgstr "new_literal"
+msgid "Association Error"
+msgstr "Памылка асацыяцыі"
 
-#: umlcanvasobject.cpp:162
+#: toolbarstateother.cpp:148 umlview.cpp:2511
 #, fuzzy
-msgid "new_field"
-msgstr "new_field"
+msgid "new state"
+msgstr "новы стан"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2779,12 +3013,6 @@ msgstr "Экспартаваць у малюнак..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Экспартаваць усе дыяграмы ў выглядзе малюнкаў..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-#, fuzzy
-msgid "&Properties"
-msgstr "Уласцівасці"
-
 #: uml.cpp:286
 #, fuzzy
 msgid "&Zoom Slider"
@@ -2880,6 +3108,13 @@ msgstr "Дакументацыя"
 msgid "Opening file..."
 msgstr "Адкрыццё файла..."
 
+#: 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
 #, fuzzy
 msgid "Creating new document..."
@@ -2888,15 +3123,15 @@ msgstr "Стварэнне новага дакумента..."
 #: uml.cpp:673
 #, fuzzy
 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Усе падтрымоўваемыя фарматы (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Усе падтрымоўваемыя фарматы (*.xmi, *."
+"xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Несціснутыя файлы XMI(*.xmi)\n"
 "*.xmi.tgz|Сціснутыя Gzip файлы XMI (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Сціснутыя Bzip2 файлы XMI (*.xmi.tar.bz2)\n"
@@ -2930,6 +3165,10 @@ msgstr ""
 "*.xmi.tar.bz2|Сціснуты Bzip2 файл XMI (*.xmi.tar.bz2)\n"
 "*|Усе файлы"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid ""
@@ -2939,6 +3178,10 @@ msgstr ""
 "Файл %1 ужо існуе.\n"
 "Замяніць яго?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2982,11 +3225,11 @@ msgstr "Устаўка змесціва буфера абмену..."
 #: uml.cpp:849
 #, fuzzy
 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
 #, fuzzy
@@ -3054,1532 +3297,1387 @@ msgstr "Усе файлы"
 msgid "Select Code to Import"
 msgstr "Вылучыце код для імпарту"
 
-#: dialogs/classgenpage.cpp:50
-#, fuzzy
-msgid "Class &name:"
-msgstr "Імя класа:"
-
-#: dialogs/classgenpage.cpp:52
+#: umlcanvasobject.cpp:150
 #, fuzzy
-msgid "Actor &name:"
-msgstr "Імя дзеючага твару:"
+msgid "new_attribute"
+msgstr "new_attribute"
 
-#: dialogs/classgenpage.cpp:54
+#: umlcanvasobject.cpp:153
 #, fuzzy
-msgid "Package &name:"
-msgstr "Імя пакета:"
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/classgenpage.cpp:56
+#: umlcanvasobject.cpp:156
 #, fuzzy
-msgid "Use case &name:"
-msgstr "Імя прэцэдэнту:"
+msgid "new_operation"
+msgstr "new_operation"
 
-#: dialogs/classgenpage.cpp:58
+#: umlcanvasobject.cpp:159
 #, fuzzy
-msgid "Interface &name:"
-msgstr "Імя інтэрфейсу:"
+msgid "new_literal"
+msgstr "new_literal"
 
-#: dialogs/classgenpage.cpp:60
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Component &name:"
-msgstr "Імя кампанента:"
+msgid "new_field"
+msgstr "new_field"
 
-#: dialogs/classgenpage.cpp:62
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "Artifact &name:"
-msgstr "Імя артэфакту:"
+msgid "UML Model"
+msgstr "Мадэль UML"
 
-#: dialogs/classgenpage.cpp:64
+#: umldoc.cpp:106
 #, fuzzy
-msgid "Enum &name:"
-msgstr "Імя які пералічваецца тыпу:"
+msgid "Logical View"
+msgstr "Лагічнае паданне"
 
-#: dialogs/classgenpage.cpp:66
+#: umldoc.cpp:107
 #, fuzzy
-msgid "Datatype &name:"
-msgstr "Імя тыпу дадзеных:"
+msgid "Use Case View"
+msgstr "Прэцэдэнты"
 
-#: dialogs/classgenpage.cpp:68
+#: umldoc.cpp:108
 #, fuzzy
-msgid "Entity &name:"
-msgstr "Імя сутнасці:"
+msgid "Component View"
+msgstr "Кампаненты"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#: umldoc.cpp:109
 #, fuzzy
-msgid "&Stereotype name:"
-msgstr "Імя стэрэатыпу:"
+msgid "Deployment View"
+msgstr "Разгортванне"
 
-#: dialogs/classgenpage.cpp:107
+#: umldoc.cpp:110
 #, fuzzy
-msgid "&Package name:"
-msgstr "Імя пакета:"
+msgid "Entity Relationship Model"
+msgstr "Адносіны"
 
-#: dialogs/classgenpage.cpp:121
+#: umldoc.cpp:117 umldoc.cpp:293
 #, fuzzy
-msgid "A&bstract class"
-msgstr "Абстрактны клас"
+msgid "Datatypes"
+msgstr "Тыпы дадзеных"
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:229
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "Абстрактны прэцэдэнт"
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Бягучы файл быў зменены.\n"
+"Захаваць яго?"
 
-#: dialogs/classgenpage.cpp:131
+#: umldoc.cpp:355
 #, fuzzy
-msgid "&Executable"
-msgstr "Камандны файл"
+msgid "The file %1 does not exist."
+msgstr "Файл %1 не існуе."
 
-#: dialogs/classgenpage.cpp:138
+#: umldoc.cpp:380
 #, fuzzy
-msgid "Draw As"
-msgstr "Паказваць як"
+msgid "The file %1 seems to be corrupted."
+msgstr "Файл %1 пашкоджаны."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-#, fuzzy
-msgid "&Default"
-msgstr "Па змаўчанні"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, fuzzy, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Сціснуты файл %1 не ўтрымоўвае XMI."
 
-#: dialogs/classgenpage.cpp:149
-#, fuzzy
-msgid "&Library"
-msgstr "Бібліятэка"
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Памылка пры загрузцы распакаванага файла: %1"
 
-#: dialogs/classgenpage.cpp:152
-#, fuzzy
-msgid "&Table"
-msgstr "Табліца"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Памылка пры загрузцы файла: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-#, fuzzy
-msgid "P&ublic"
-msgstr "Публічны"
+#: umldoc.cpp:641
+#, fuzzy, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Памылка пры запампоўцы файла на сервер: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
+#: umldoc.cpp:934
 #, fuzzy
-msgid "P&rivate"
-msgstr "Прыватны"
+msgid "use case diagram"
+msgstr "Дыяграма прэцэдэнтаў"
 
-#: dialogs/classgenpage.cpp:182
+#: umldoc.cpp:936
 #, fuzzy
-msgid "Pro&tected"
-msgstr "Абаронены"
+msgid "class diagram"
+msgstr "Дыяграма класаў"
 
-#: dialogs/classgenpage.cpp:186
+#: umldoc.cpp:938
 #, fuzzy
-msgid "Imple&mentation"
-msgstr "Рэалізацыя"
+msgid "sequence diagram"
+msgstr "Дыяграма паслядоўнасці"
 
-#: dialogs/classgenpage.cpp:256
+#: umldoc.cpp:940
 #, fuzzy
-msgid "Class name:"
-msgstr "Імя класа:"
+msgid "collaboration diagram"
+msgstr "Дыяграма кааперацыі"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#: umldoc.cpp:942
 #, fuzzy
-msgid "Instance name:"
-msgstr "Імя асобніка:"
+msgid "state diagram"
+msgstr "Дыяграма станаў"
 
-#: dialogs/classgenpage.cpp:272
+#: umldoc.cpp:944
 #, fuzzy
-msgid "Draw as actor"
-msgstr "Маляваць як дзеючы твар"
+msgid "activity diagram"
+msgstr "Дыяграма дзейнасці"
 
-#: dialogs/classgenpage.cpp:277
+#: umldoc.cpp:946
 #, fuzzy
-msgid "Multiple instance"
-msgstr "Некалькі асобнікаў"
+msgid "component diagram"
+msgstr "Дыяграма кампанентаў"
 
-#: dialogs/classgenpage.cpp:284
+#: umldoc.cpp:948
 #, fuzzy
-msgid "Show destruction"
-msgstr "Паказаць дэструкцыю"
+msgid "deployment diagram"
+msgstr "Дыяграма разгортвання"
 
-#: dialogs/classgenpage.cpp:322
+#: umldoc.cpp:950
 #, fuzzy
-msgid "Component name:"
-msgstr "Імя кампанента:"
+msgid "entity relationship diagram"
+msgstr "Дыяграма адносін сутнасцяў"
 
-#: dialogs/classgenpage.cpp:324
+#: umldoc.cpp:984 umldoc.cpp:1017
 #, fuzzy
-msgid "Node name:"
-msgstr "Імя вузла:"
+msgid "That is an invalid name for a diagram."
+msgstr "Недапушчальнае імя дыяграмы."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
+#: umldoc.cpp:998 umldoc.cpp:1025
 #, fuzzy
-msgid "Stereotype name:"
-msgstr "Імя стэрэатыпу:"
+msgid "A diagram is already using that name."
+msgstr "Дыяграма ўжо выкарыстае гэтае імя."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 #, fuzzy
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Гэтае імя ўжо выкарыстоўваецца.\n"
-"Яно скінута."
+"Такое імя ўжо існуе.\n"
+"Вы жадаеце менавіта гэта?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "Name is Not Unique"
-msgstr "Імя ўжо існуе"
+msgid "Use Name"
+msgstr "Выкарыстаць паказанае імя"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "&Line:"
-msgstr "Лінія:"
+msgid "Enter New Name"
+msgstr "Увядзіце новае імя"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "&Fill:"
-msgstr "Фон:"
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Выдаліць '%1'?"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "D&efault"
-msgstr "Па змаўчанні"
+msgid "Delete Diagram"
+msgstr "Выдаліць дыяграму"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
+#: umldoc.cpp:1573
 #, fuzzy
-msgid "&Use fill"
-msgstr "Непразрысты фон"
+msgid "Setting up the document..."
+msgstr "Пабудова дакумента..."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+#: umldoc.cpp:1600
 #, fuzzy
-msgid "Activities"
-msgstr "Дзейнасці"
+msgid "Resolving object references..."
+msgstr "Дазвол спасылак на аб'екты..."
 
-#: dialogs/activitypage.cpp:72
+#: umldoc.cpp:1638
 #, fuzzy
-msgid "New Activity..."
-msgstr "Новая дзейнасць..."
+msgid "Loading UML elements..."
+msgstr "Загрузка элементаў UML..."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+#: umldoc.cpp:1811
 #, fuzzy
-msgid "Rename"
-msgstr "Пераназваць"
+msgid "Loading diagrams..."
+msgstr "Загрузка дыяграм..."
 
-#: dialogs/activitypage.cpp:134
-#, fuzzy
-msgid "New Activity"
-msgstr "Новая дзейнасць"
+#: umldoc.cpp:2104
+#, fuzzy, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/activitypage.cpp:153
+#: umllistview.cpp:348
 #, fuzzy
-msgid "Rename Activity"
-msgstr "Пераназваць дзейнасць"
+msgid "Externalize Folder"
+msgstr "Зрабіць тэчку знешняй"
 
-#: dialogs/activitypage.cpp:153
+#: umllistview.cpp:416
 #, fuzzy
-msgid "Enter the new name of the activity:"
-msgstr "Увядзіце новае імя дзейнасці:"
+msgid "Enter Model Name"
+msgstr "Увядзіце імя мадэлі"
 
-#: dialogs/assocpropdlg.cpp:39
+#: umllistview.cpp:417
 #, fuzzy
-msgid "Association Properties"
-msgstr "Уласцівасці асацыяцыі"
+msgid "Enter the new name of the model:"
+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
+#: umllistview.cpp:1007
 #, fuzzy
-msgid "General Settings"
-msgstr "Агульныя налады"
+msgid "Views"
+msgstr "Паданні"
 
-#: dialogs/assocpropdlg.cpp:94
+#: umllistview.cpp:1906
 #, fuzzy
-msgid "Roles"
-msgstr "Ролі"
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Паказанае імя недапушчальна\n"
+"Стварэнне скасавана."
 
-#: dialogs/assocpropdlg.cpp:94
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
 #, fuzzy
-msgid "Role Settings"
-msgstr "Канфігурацыя роляў"
+msgid "Name Not Valid"
+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
+#: umllistview.cpp:1923 umllistview.cpp:2160
 #, fuzzy
-msgid "Font Settings"
-msgstr "Налады шрыфтоў"
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Паказанае імя ўжо выкарыстоўваецца\n"
+"Стварэнне скасавана."
 
-#: dialogs/assocpropdlg.cpp:112
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
 #, fuzzy
-msgid "Association font"
-msgstr "Шрыфт асацыяцыі"
+msgid "Creation canceled"
+msgstr "Стварэнне скасавана"
 
-#: dialogs/umltemplatedialog.cpp:36
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Template Properties"
-msgstr "Уласцівасці шаблону"
+msgid "Loading listview..."
+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
+#: umllistview.cpp:2670
 #, fuzzy
-msgid "General Properties"
-msgstr "Агульныя параметры"
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Выдаляемая тэчка павінна быць пусты."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
+#: umllistview.cpp:2671
 #, fuzzy
-msgid "&Type:"
-msgstr "Тып:"
+msgid "Folder Not Empty"
+msgstr "Тэчка не пустая"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
 #, fuzzy
-msgid "&Name:"
-msgstr "Імя:"
+msgid "Rename canceled"
+msgstr "Пераназванне скасавана"
 
-#: dialogs/umltemplatedialog.cpp:128
+#: umllistviewitem.cpp:468
 #, fuzzy
-msgid "You have entered an invalid template name."
-msgstr "Няслушнае імя шаблону."
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Пераназванне запісу тыпу %1 у спісе не падтрымліваецца."
 
-#: dialogs/umltemplatedialog.cpp:129
+#: umllistviewitem.cpp:469
 #, fuzzy
-msgid "Template Name Invalid"
-msgstr "Няслушнае імя шаблону"
+msgid "Function Not Implemented"
+msgstr "Функцыя не рэалізаваная"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 #, fuzzy
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Паказанае імя параметру шаблону ўжо выкарыстоўваецца ў гэтай аперацыі."
-
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "Імя параметру шаблону не ўнікальна"
-
-#: dialogs/umlentityattributedialog.cpp:43
-#, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Уласцівасці атрыбуту сутнасці"
-
-#: dialogs/umlentityattributedialog.cpp:73
-#, fuzzy
-msgid "&Default value:"
-msgstr "Значэнне па змаўчанні:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-#, fuzzy
-msgid "Length/Values:"
-msgstr "Даўжыня/Значэнні:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-#, fuzzy
-msgid "&Auto increment"
-msgstr "Аўта-інкрымент"
-
-#: dialogs/umlentityattributedialog.cpp:88
-#, fuzzy
-msgid "Allow &null"
-msgstr "Дазволіць null"
-
-#: dialogs/umlentityattributedialog.cpp:92
-#, fuzzy
-msgid "Attributes:"
-msgstr "Атрыбуты:"
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Паказанае імя недапушчальна.\n"
+"Пераназванне скасавана."
 
-#: dialogs/umlentityattributedialog.cpp:108
+#: umlview.cpp:297 umlview.cpp:357
 #, fuzzy
-msgid "Indexing"
-msgstr "Індэксаванне"
+msgid "Diagram: %2 Page %1"
+msgstr "Дыяграма: %2 Старонка %1"
 
-#: dialogs/umlentityattributedialog.cpp:112
+#: umlview.cpp:2578
 #, fuzzy
-msgid "&None"
-msgstr "Адключана"
+msgid "Enter Diagram Name"
+msgstr "Увядзіце імя дыяграмы"
 
-#: dialogs/umlentityattributedialog.cpp:115
+#: umlview.cpp:2579
 #, fuzzy
-msgid "&Primary"
-msgstr "Першаснае"
+msgid "Enter the new name of the diagram:"
+msgstr "Увядзіце новае імя дыяграмы:"
 
-#: dialogs/umlentityattributedialog.cpp:118
+#: umlview.cpp:2736
 #, fuzzy
-msgid "&Index"
-msgstr "Індэкс"
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr "Выдаліць дыяграму цалкам?"
 
-#: dialogs/umlentityattributedialog.cpp:121
+#: umlview.cpp:2738
 #, fuzzy
-msgid "&Unique"
-msgstr "Унікальнае"
+msgid "Delete Diagram?"
+msgstr "Выдаліць дыяграму?"
 
-#: dialogs/umlentityattributedialog.cpp:184
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "Вы ўвялі недапушчальнае імя атрыбуту сутнасці."
+msgid "Exporting view..."
+msgstr "Выхад..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-#, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "Імя атрыбуту сутнасці недапушчальна"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 #, fuzzy
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Такое імя атрыбуту сутнасці ўжо выкарыстоўваецца ў гэтай аперацыі."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Вылучаны файл %1 ужо існуе.\n"
+"Замяніць яго?"
 
-#: dialogs/umlentityattributedialog.cpp:193
+#: umlviewimageexporter.cpp:67
 #, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "Імя атрыбуту сутнасці ўжо выкарыстоўваецца"
+msgid "File Already Exists"
+msgstr "Файл ужо існуе"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-#, fuzzy
-msgid "Display"
-msgstr "Адлюстраванне"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Немагчыма стварыць тэчку"
 
-#: dialogs/umlviewdialog.cpp:93
+#: umlviewimageexportermodel.cpp:145
 #, fuzzy
-msgid "Classes Display Options"
-msgstr "Параметры адлюстравання класаў"
+msgid "Can not save an empty diagram"
+msgstr "Дыяграма пустая"
 
-#: dialogs/umlviewdialog.cpp:100
-#, fuzzy
-msgid "Diagram Colors"
-msgstr "Колеры дыяграм"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-#, fuzzy
-msgid "The name you have entered is invalid."
-msgstr "Паказана няправільнае імя."
+#: 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/umlviewdialog.cpp:170
-#, fuzzy
-msgid "The name you have entered is not unique."
-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 ""
 
-#: dialogs/assocgenpage.cpp:80
+#: worktoolbar.cpp:245
 #, fuzzy
-msgid "Type:"
-msgstr "Тып:"
+msgid "Object"
+msgstr "Аб'ект"
 
-#: dialogs/settingsdlg.cpp:30
+#: worktoolbar.cpp:246
 #, fuzzy
-msgid "Umbrello Setup"
-msgstr "Налада Umbrello"
+msgid "Synchronous Message"
+msgstr "Сінхроннае паведамленне"
 
-#: dialogs/settingsdlg.cpp:47
+#: worktoolbar.cpp:247
 #, fuzzy
-msgid "User Interface"
-msgstr "Інтэрфейс"
+msgid "Asynchronous Message"
+msgstr "Асінхроннае паведамленне"
 
-#: dialogs/settingsdlg.cpp:47
+#: worktoolbar.cpp:251
 #, fuzzy
-msgid "User Interface Settings"
-msgstr "Карыстацкі інтэрфейс"
+msgid "Label"
+msgstr "Надпіс"
 
-#: dialogs/settingsdlg.cpp:54
+#: worktoolbar.cpp:252
 #, fuzzy
-msgid "Line color:"
-msgstr "Колер лініі:"
+msgid "Note"
+msgstr "Нататка"
 
-#: dialogs/settingsdlg.cpp:60
+#: worktoolbar.cpp:253
 #, fuzzy
-msgid "D&efault Color"
-msgstr "Колер па змаўчанні"
+msgid "Box"
+msgstr "Блок"
 
-#: dialogs/settingsdlg.cpp:63
+#: worktoolbar.cpp:257
 #, fuzzy
-msgid "Fill color:"
-msgstr "Колер фону:"
+msgid "Relationship"
+msgstr "Дачыненне"
 
-#: dialogs/settingsdlg.cpp:69
+#: worktoolbar.cpp:258
 #, fuzzy
-msgid "De&fault Color"
-msgstr "Колер па змаўчанні"
+msgid "Directional Association"
+msgstr "Прамая асацыяцыя"
 
-#: dialogs/settingsdlg.cpp:73
+#: worktoolbar.cpp:259
 #, fuzzy
-msgid "Line width:"
-msgstr "Шырыня радка:"
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Рэалізуе (абагульненне і рэалізацыя)"
 
-#: dialogs/settingsdlg.cpp:81
+#: worktoolbar.cpp:275
 #, fuzzy
-msgid "D&efault Width"
-msgstr "Шырыня па змаўчанні"
+msgid "Deep History"
+msgstr "Глыбей"
 
-#: dialogs/settingsdlg.cpp:86
+#: worktoolbar.cpp:276
 #, fuzzy
-msgid "&Use fill color"
-msgstr "Непразрысты фон"
+msgid "Shallow History"
+msgstr "Вышэй"
 
-#: dialogs/settingsdlg.cpp:108
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Enable undo"
-msgstr "Уключыць запіс дзеянняў для адмены"
+msgid "Join"
+msgstr "Далучэнне"
 
-#: dialogs/settingsdlg.cpp:112
+#: worktoolbar.cpp:278
 #, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "Выкарыстаць укладкі"
+msgid "Fork"
+msgstr "Аддзяленне"
 
-#: dialogs/settingsdlg.cpp:116
+#: worktoolbar.cpp:279
 #, fuzzy
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Выкарыстаць новыя генератары класаў C++, Java і Ruby"
+msgid "Junction"
+msgstr "Спалучэнне"
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:280
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "Вобласць бачнасці палёў асацыяцыі па змаўчанні:"
+msgid "Choice"
+msgstr "Выбар"
 
-#: dialogs/settingsdlg.cpp:126
+#: worktoolbar.cpp:285
 #, fuzzy
-msgid "Autosave"
-msgstr "Аўтазахаванне"
+msgid "Activity Transition"
+msgstr "Пераход дзейнасці"
 
-#: dialogs/settingsdlg.cpp:132
+#: worktoolbar.cpp:290
 #, fuzzy
-msgid "E&nable autosave"
-msgstr "Уключыць аўтазахаванне"
+msgid "Message"
+msgstr "Паведамленне"
 
-#: dialogs/settingsdlg.cpp:136
+#: worktoolbar.cpp:298
 #, fuzzy
-msgid "Select auto-save time interval (mins):"
-msgstr "Інтэрвал аўтазахавання, мін:"
+msgid "UNDEFINED"
+msgstr "UNDEFINED"
 
-#: dialogs/settingsdlg.cpp:146
+#: worktoolbar.cpp:302
 #, fuzzy
-msgid "Set autosave suffix:"
-msgstr "Пашырэнне аўтазахавання:"
+msgid "Select"
+msgstr "Вылучэнне"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-#, fuzzy
-msgid "Startup"
-msgstr "Запуск прыкладання"
-
-#: dialogs/settingsdlg.cpp:164
-#, fuzzy
-msgid "Sta&rtup logo"
-msgstr "Паказваць застаўку"
-
-#: dialogs/settingsdlg.cpp:168
-#, fuzzy
-msgid "&Tip of the day"
-msgstr "Рада дня"
-
-#: dialogs/settingsdlg.cpp:172
-#, fuzzy
-msgid "&Load last project"
-msgstr "Адкрыць апошні праект"
-
-#: dialogs/settingsdlg.cpp:176
-#, fuzzy
-msgid "Start new project with:"
-msgstr "Дыяграма па змаўчанні для новага праекту:"
-
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "No Diagram"
-msgstr "Пусты"
-
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "Class Diagram"
-msgstr "Дыяграма класа"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Use Case Diagram"
-msgstr "Дыяграма прэцэдэнтаў"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Sequence Diagram"
-msgstr "Дыяграма паслядоўнасцяў"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "Collaboration Diagram"
-msgstr "Дыяграма кааперацыі"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Паказаць аперацыі"
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "State Diagram"
-msgstr "Дыяграма станаў"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Activity Diagram"
-msgstr "Дыяграма дзейнасці"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Ачысціць дыяграму"
 
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Component Diagram"
-msgstr "Дыяграма кампанентаў"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-#, fuzzy
-msgid "Deployment Diagram"
-msgstr "Дыяграма разгорткі"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Абагульненне"
 
-#: dialogs/settingsdlg.cpp:210
-#, fuzzy
-msgid "Class Settings"
-msgstr "Параметры класа"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-#, fuzzy
-msgid "Show &visibility"
-msgstr "Паказаць бачнасць"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-#, fuzzy
-msgid "Show attributes"
-msgstr "Паказаць атрыбуты"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Імя асацыяцыі"
 
-#: dialogs/settingsdlg.cpp:225
-#, fuzzy
-msgid "Show operations"
-msgstr "Паказаць аперацыі"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-#, fuzzy
-msgid "Show stereot&ype"
-msgstr "Паказаць стэрэатып"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-#, fuzzy
-msgid "Show attribute signature"
-msgstr "Паказаць сігнатуру атрыбуту"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-#, fuzzy
-msgid "Show package"
-msgstr "Паказаць пакет"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Па змаўчанні"
 
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
-msgstr "Пачатковая вобласць бачнасці"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "Вобласць бачнасці атрыбутаў па змаўчанні"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, fuzzy, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Слеш-Слеш (//)"
 
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "Вобласць бачнасці аперацый па змаўчанні"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, fuzzy, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Слеш-Зорачка (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation"
-msgstr "Генераванне кода"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, fuzzy, no-c-format
+msgid "Style:"
+msgstr "Стыль:"
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation Settings"
-msgstr "Генераванне кода"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Генераванне кода C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-#, fuzzy
-msgid "Code Viewer Settings"
-msgstr "Прагляд кода"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, fuzzy, no-c-format
+msgid "Method Body Generation"
+msgstr "Генераванне цела метаду"
 
-#: dialogs/umloperationdialog.cpp:50
-#, fuzzy
-msgid "Operation Properties"
-msgstr "Уласцівасці аперацыі"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, fuzzy, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Выкарыстаць наступныя класы пры генераванні кода:"
 
-#: dialogs/umloperationdialog.cpp:89
-#, fuzzy
-msgid "&Abstract operation"
-msgstr "Абстрактная аперацыя"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, fuzzy, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-#, fuzzy
-msgid "Classifier &scope (\"static\")"
-msgstr "Вобласць бачнасці класіфікатара (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, fuzzy, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-#, fuzzy
-msgid "&Query (\"const\")"
-msgstr "Запыт (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, fuzzy, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Пераменная</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-#, fuzzy
-msgid "Prot&ected"
-msgstr "Абаронены"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, fuzzy, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "Рэалізацыя"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, fuzzy, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-#, fuzzy
-msgid "Parameters"
-msgstr "Параметры"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, fuzzy, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-#, fuzzy
-msgid "Ne&w Parameter..."
-msgstr "Стварыць параметр..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-#, fuzzy
-msgid "You have entered an invalid parameter name."
-msgstr "Няправільнае імя параметру."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">List</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-#, fuzzy
-msgid "Parameter Name Invalid"
-msgstr "Няправільнае імя параметру"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, fuzzy, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-#, fuzzy
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Вылучанае імя параметру ўжо\n"
-"выкарыстоўваецца ў гэтай аперацыі."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, fuzzy, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-#, fuzzy
-msgid "Parameter Name Not Unique"
-msgstr "Імя параметру не ўнікальна"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, fuzzy, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-#, fuzzy
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Паказанае імя параметру ўжо выкарыстоўваецца ў гэтай аперацыі."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, fuzzy, no-c-format
+msgid "Class name"
+msgstr "Імя класа"
 
-#: dialogs/umloperationdialog.cpp:456
-#, fuzzy
-msgid "You have entered an invalid operation name."
-msgstr "Недапушчальнае імя аперацыі."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, fuzzy, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Уключыць файл</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-#, fuzzy
-msgid "Operation Name Invalid"
-msgstr "Недапушчальнае імя аперацыі"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Project Generation"
+msgstr "Генераванне праекту"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-#, fuzzy
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Аперацыя з такой жа сігнатурай ужо існуе ў %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Стварыць зборачны файл ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-#, fuzzy
-msgid "Choose a different name or parameter list."
-msgstr "Вылучыце іншае імя або набор параметраў."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Генераваць метады аўтаматычна"
 
-#: dialogs/assocrolepage.cpp:50
-#, fuzzy
-msgid "Role A Properties"
-msgstr "Уласцівасці ролі A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, fuzzy, no-c-format
+msgid "Empty constructor methods"
+msgstr "Пустыя канструктары"
 
-#: dialogs/assocrolepage.cpp:51
-#, fuzzy
-msgid "Role B Properties"
-msgstr "Уласцівасці ролі B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, fuzzy, no-c-format
+msgid "Association accessor methods"
+msgstr "Метады доступу да асацыяцыі"
 
-#: dialogs/assocrolepage.cpp:68
-#, fuzzy
-msgid "Role A Visibility"
-msgstr "Бачнасць ролі A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, fuzzy, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Метады доступу да атрыбутаў"
 
-#: dialogs/assocrolepage.cpp:69
-#, fuzzy
-msgid "Role B Visibility"
-msgstr "Бачнасць ролі B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, fuzzy, no-c-format
+msgid "From Parent Object"
+msgstr "Ад бацькоўскага аб'екта"
 
-#: dialogs/assocrolepage.cpp:70
-#, fuzzy
-msgid "Role A Changeability"
-msgstr "Магчымасць змены ролі A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Вобласць бачнасці метадаў доступу да атрыбутаў па змаўчанні:"
 
-#: dialogs/assocrolepage.cpp:71
-#, fuzzy
-msgid "Role B Changeability"
-msgstr "Магчымасць змены ролі B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "Вобласць бачнасці палёў асацыяцыі па змаўчанні:"
 
-#: dialogs/pkgcontentspage.cpp:29
-#, fuzzy
-msgid "Contained Items"
-msgstr "Змесціва"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, fuzzy, no-c-format
+msgid "From Parent Role"
+msgstr "Ад бацькоўскай ролі"
 
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "Нататка"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Генерацыя кода на Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-#, fuzzy
-msgid "N&ew Attribute..."
-msgstr "Стварыць атрыбут..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, fuzzy, no-c-format
+msgid "Hash (#)"
+msgstr "Дыез (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-#, fuzzy
-msgid "N&ew Operation..."
-msgstr "Стварыць аперацыю..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, fuzzy, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Пачатак-канец (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates"
-msgstr "Шаблоны"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Генераванне кода Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-#, fuzzy
-msgid "N&ew Template..."
-msgstr "Стварыць шаблон..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "Мова"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals"
-msgstr "Якія пералічваюцца канстанты"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, fuzzy, no-c-format
+msgid "Folders"
+msgstr "Тэчкі"
 
-#: dialogs/classifierlistpage.cpp:48
-#, fuzzy
-msgid "N&ew Enum Literal..."
-msgstr "Дадаць якая пералічваецца канстанту..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, fuzzy, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Захоўваць згенераваныя файлы ў тэчку:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Атрыбуты сутнасці"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Bro&wse..."
+msgstr "Агляд..."
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "Стварыць атрыбут сутнасці..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, fuzzy, no-c-format
+msgid "B&rowse..."
+msgstr "Агляд..."
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "Initial activity"
-msgstr "Пачатковая дзейнасць"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "Падлучаць загалоўкавыя файлы з тэчкі:"
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "End activity"
-msgstr "Канчатковая дзейнасць"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, fuzzy, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Згенераваныя файлы будуць захаваныя ў гэтай тэчцы"
 
-#: dialogs/activitydialog.cpp:82
-#, fuzzy
-msgid "Activity type:"
-msgstr "Тып дзейнасці:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, fuzzy, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Файлы з гэтай тэчкі будуць выкарыстоўвацца як загалоўкавыя пры генераванні "
+"кода"
 
-#: dialogs/activitydialog.cpp:87
-#, fuzzy
-msgid "Activity name:"
-msgstr "Імя дзейнасці:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, fuzzy, no-c-format
+msgid "Overwrite Policy"
+msgstr "Наяўныя файлы"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-#, fuzzy
-msgid "Widget Colors"
-msgstr "Колеры"
+#: dialogs/codegenerationoptionsbase.ui:214
+#, fuzzy, 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 ""
+"Калі файл з імем, якое будзе скарыстана\n"
+"генератарам кода, ужо існуе:"
 
-#: dialogs/umlattributedialog.cpp:42
-#, fuzzy
-msgid "Attribute Properties"
-msgstr "Уласцівасці атрыбуту"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, fuzzy, no-c-format
+msgid "O&verwrite"
+msgstr "Замяняць"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-#, fuzzy
-msgid "&Initial value:"
-msgstr "Пачатковае значэнне:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, fuzzy, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Замяняць наяўныя файлы"
 
-#: dialogs/umlattributedialog.cpp:91
-#, fuzzy
-msgid "&Public"
-msgstr "Публічны"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, fuzzy, no-c-format
+msgid "As&k"
+msgstr "Спытаць"
 
-#: dialogs/umlattributedialog.cpp:155
-#, fuzzy
-msgid "You have entered an invalid attribute name."
-msgstr "Вы ўвялі недапушчальнае імя атрыбуту."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, fuzzy, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Калі файл з такім імем ужо існуе, спытаць аб далейшых дзеяннях"
 
-#: dialogs/umlattributedialog.cpp:156
-#, fuzzy
-msgid "Attribute Name Invalid"
-msgstr "Імя атрыбуту недапушчальна"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, fuzzy, no-c-format
+msgid "&Use a different name"
+msgstr "Вылучыць іншае імя"
 
-#: dialogs/umlattributedialog.cpp:163
-#, fuzzy
+#: dialogs/codegenerationoptionsbase.ui:251
+#, fuzzy, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Такое імя атрыбуту ўжо выкарыстоўваецца."
+"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/umlattributedialog.cpp:164
-#, fuzzy
-msgid "Attribute Name Not Unique"
-msgstr "Імя атрыбуту ўжо выкарыстоўваецца"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, fuzzy, no-c-format
+msgid "Formatting"
+msgstr "Афармленне"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "Вылучыце аперацыю"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, fuzzy, no-c-format
+msgid "Lines"
+msgstr "Радкі"
 
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "Нумар прытрымлівання:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "Канец радка:"
 
-#: dialogs/selectopdlg.cpp:46
-#, fuzzy
-msgid "Class operation:"
-msgstr "Класавая аперацыя:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, fuzzy, no-c-format
+msgid "Indentation type:"
+msgstr "Тып водступаў:"
 
-#: dialogs/selectopdlg.cpp:54
-#, fuzzy
-msgid "Custom operation:"
-msgstr "Іншае дзеянне:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, fuzzy, no-c-format
+msgid "Indentation amount:"
+msgstr "Колькасць знакаў:"
 
-#: dialogs/diagramprintpage.cpp:35
-#, fuzzy
-msgid "&Diagrams"
-msgstr "Дыяграмы"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, fuzzy, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "Unix (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-#, fuzzy
-msgid "Filter"
-msgstr "Фільтр"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-#, fuzzy
-msgid "&Current diagram"
-msgstr "Бягучая дыяграма"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, fuzzy, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-#, fuzzy
-msgid "&All diagrams"
-msgstr "Усе дыяграмы"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, fuzzy, no-c-format
+msgid "No Indentation"
+msgstr "Без водступаў"
 
-#: dialogs/diagramprintpage.cpp:57
-#, fuzzy
-msgid "&Select diagrams"
-msgstr "Вылучыць дыяграмы"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, fuzzy, no-c-format
+msgid "Tab"
+msgstr "Табуляцыя"
 
-#: dialogs/diagramprintpage.cpp:61
-#, fuzzy
-msgid "&Type of diagram"
-msgstr "Тып дыяграмы"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, fuzzy, no-c-format
+msgid "Space"
+msgstr "Прабел"
 
-#: dialogs/diagramprintpage.cpp:65
-#, fuzzy
-msgid "Selection"
-msgstr "Вылучэнне"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, fuzzy, no-c-format
+msgid "Comment Verbosity"
+msgstr "Падрабязнасць каментароў"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-#, fuzzy
-msgid "Collaboration"
-msgstr "Кааперацыя"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, fuzzy, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Устаўляць каментары для секцый нават калі яны пустыя"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-#, fuzzy
-msgid "Sequence"
-msgstr "Паслядоўнасць"
+#: dialogs/codegenerationoptionsbase.ui:436
+#, fuzzy, 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "Разгортванне"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, fuzzy, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Устаўляць каментары ў дакументацыю нават калі яны пустыя"
 
-#: dialogs/diagramprintpage.cpp:135
-#, fuzzy
-msgid "No diagrams selected."
-msgstr "Няма вылучаных дыяграм."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, fuzzy, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Устаўляць каментары для класаў і метадаў нават калі яны пустыя"
 
-#: dialogs/classpropdlg.cpp:118
-#, fuzzy
-msgid "Display Options"
-msgstr "Параметры адлюстравання"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, fuzzy, no-c-format
+msgid "Language Options"
+msgstr "Мовы праграмавання"
 
-#: dialogs/classpropdlg.cpp:179
-#, fuzzy
-msgid "Attribute Settings"
-msgstr "Атрыбуты"
+#: dialogs/codegenerationwizardbase.ui:16
+#, fuzzy, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Майстар генеравання кода"
 
-#: dialogs/classpropdlg.cpp:187
-#, fuzzy
-msgid "Operation Settings"
-msgstr "Аперацыі"
+#: dialogs/codegenerationwizardbase.ui:23
+#, fuzzy, no-c-format
+msgid "Select Classes"
+msgstr "Вылучыце класы"
 
-#: dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates Settings"
-msgstr "Шаблоны"
+#: dialogs/codegenerationwizardbase.ui:40
+#, fuzzy, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Змесціце класы, для якіх вы жадаеце згенераваць код,\n"
+"у спіс справа"
 
-#: dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals Settings"
-msgstr "Канфігурацыя якія пералічваюцца канстант"
+#: dialogs/codegenerationwizardbase.ui:78
+#, fuzzy, no-c-format
+msgid "Add class for code generation"
+msgstr "Дадаць клас для генеравання кода"
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Атрыбуты сутнасці"
+#: dialogs/codegenerationwizardbase.ui:101
+#, fuzzy, no-c-format
+msgid "Classes Selected"
+msgstr "Вылучаныя класы"
 
-#: dialogs/classpropdlg.cpp:216
-#, fuzzy
-msgid "Contents Settings"
-msgstr "Утрыманне"
+#: dialogs/codegenerationwizardbase.ui:136
+#, fuzzy, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Выдаліць клас з генерацыі кода"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Associations"
-msgstr "Асацыяцыі"
+#: dialogs/codegenerationwizardbase.ui:159
+#, fuzzy, no-c-format
+msgid "Classes Available"
+msgstr "Даступныя класы"
 
-#: dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Class Associations"
-msgstr "Класавыя асацыяцыі"
+#: dialogs/codegenerationwizardbase.ui:209
+#, fuzzy, no-c-format
+msgid "Code Generation Status"
+msgstr "Стан генеравання кода"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-#, fuzzy
-msgid "Operatio&ns"
-msgstr "Аперацыі"
+#: dialogs/codegenerationwizardbase.ui:226
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Націсніце кнопку для запуску генерацыі кода"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-#, fuzzy
-msgid "&Visibility"
-msgstr "Бачнасць"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, fuzzy, no-c-format
+msgid "Generation Status"
+msgstr "Стан генеравання"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr "Сігнатура аперацыі"
+#: dialogs/codeviewerdialogbase.ui:43
+#, fuzzy, no-c-format
+msgid "Show hidden blocks"
+msgstr "Адлюстроўваць утоеныя блокі"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-#, fuzzy
-msgid "Pac&kage"
-msgstr "Пакет"
+#: dialogs/codeviewerdialogbase.ui:59
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">тут імя кампанента</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-#, fuzzy
-msgid "Att&ributes"
-msgstr "Атрыбуты"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-#, fuzzy
-msgid "Stereot&ype"
-msgstr "Стэрэатып"
+#: dialogs/codeviewerdialogbase.ui:86
+#, fuzzy, no-c-format
+msgid "Show block type"
+msgstr "Адлюстроўваць тып блока"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-#, fuzzy
-msgid "Attr&ibute signature"
-msgstr "Сігнатура атрыбуту"
+#: dialogs/codevieweroptionsbase.ui:45
+#, fuzzy, no-c-format
+msgid "Colors"
+msgstr "Колеры"
 
-#: dialogs/classoptionspage.cpp:108
-#, fuzzy
-msgid "Draw as circle"
-msgstr "Маляваць як акружнасць"
+#: dialogs/codevieweroptionsbase.ui:72
+#, fuzzy, no-c-format
+msgid "Font:"
+msgstr "Шрыфт:"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "Initial state"
-msgstr "Пачатковы стан"
+#: dialogs/codevieweroptionsbase.ui:103
+#, fuzzy, no-c-format
+msgid "Paper:"
+msgstr "Папера:"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "End state"
-msgstr "Канчатковы стан"
+#: dialogs/codevieweroptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "Selected:"
+msgstr "Вылучэнне:"
 
-#: dialogs/statedialog.cpp:96
-#, fuzzy
-msgid "State type:"
-msgstr "Тып стану:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Блок аб'екта UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-#, fuzzy
-msgid "State name:"
-msgstr "Імя стану:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Утоены блок:</p>"
 
-#: dialogs/statedialog.cpp:130
-#, fuzzy
-msgid "Widget Color"
-msgstr "Колер элемента"
+#: dialogs/codevieweroptionsbase.ui:294
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Нязменлівы тэкст:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-#, fuzzy
-msgid "new_class"
-msgstr "new_class"
+#: dialogs/codevieweroptionsbase.ui:333
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Змяняны тэкст:</p>"
 
-#: dialogs/classwizard.cpp:54
-#, fuzzy
-msgid "New Class"
-msgstr "Новы клас"
+#: dialogs/diagrampropertiespage.ui:30
+#, fuzzy, no-c-format
+msgid "Diagram Properties"
+msgstr "Параметры дыяграмы"
 
-#: dialogs/classwizard.cpp:59
-#, fuzzy
-msgid "Class Attributes"
-msgstr "Класавыя атрыбуты"
+#: dialogs/diagrampropertiespage.ui:92
+#, fuzzy, no-c-format
+msgid "Zoom:"
+msgstr "Маштаб:"
 
-#: dialogs/classwizard.cpp:63
-#, fuzzy
-msgid "Class Operations"
-msgstr "Аперацыі класа"
+#: dialogs/diagrampropertiespage.ui:119
+#, fuzzy, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-#, fuzzy
-msgid "Parameter Properties"
-msgstr "Уласцівасці параметру"
+#: dialogs/diagrampropertiespage.ui:186
+#, fuzzy, no-c-format
+msgid "Show &grid"
+msgstr "Сетка"
 
-#: dialogs/parmpropdlg.cpp:82
-#, fuzzy
-msgid "Passing Direction"
-msgstr "Кірунак перадачы"
+#: dialogs/diagrampropertiespage.ui:194
+#, fuzzy, no-c-format
+msgid "Snap &to grid"
+msgstr "Прывязаць да сеткі"
 
-#: dialogs/parmpropdlg.cpp:84
-#, fuzzy
+#: dialogs/diagrampropertiespage.ui:202
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "Прывязаць памер кампанентаў"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, fuzzy, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" - параметр толькі для чытання, \"out\" - параметр толькі для запісу і "
-"\"inout\" - параметр як для чытання, так і для запісу."
-
-#: dialogs/codegenerationwizard.cpp:70
-#, fuzzy
-msgid "&Generate"
-msgstr "Генераваць"
-
-#: dialogs/codegenerationwizard.cpp:120
-#, fuzzy
-msgid "Finish"
-msgstr "Гатова"
-
-#: dialogs/codegenerationwizard.cpp:132
-#, fuzzy
-msgid "Code Generated"
-msgstr "Код згенераваны"
+"Прывязаць памер кампанентаў да кроку сеткі.\n"
+"Калі ўключаны параметр \"Прывязаць да сеткі\", усе чатыры боку кампанента "
+"будуць размяшчацца па сетцы."
 
-#: dialogs/codegenerationwizard.cpp:134
-#, fuzzy
-msgid "Not Generated"
-msgstr "Не згенераваны"
+#: dialogs/diagrampropertiespage.ui:257
+#, fuzzy, no-c-format
+msgid "Grid spacing:  "
+msgstr "Інтэрвал сеткі:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-#, fuzzy
-msgid "Not Yet Generated"
-msgstr "Яшчэ не згенераваны"
+#: dialogs/diagrampropertiespage.ui:265
+#, fuzzy, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Тэчка %1 не існуе. Стварыць яе?"
+#: dialogs/diagrampropertiespage.ui:284
+#, fuzzy, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Тэчка высновы не існуе"
+#: dialogs/diagrampropertiespage.ui:346
+#, fuzzy, no-c-format
+msgid "Line width:  "
+msgstr "Шырыня радка:  "
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Стварыць тэчку"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Захаваць як малюнак..."
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "Не ствараць"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:168
-#, fuzzy
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
-"Немагчыма стварыць тэчку.\n"
-"Упэўніцеся, што ў вас ёсць правы на запіс на бацькоўскай тэчцы або вылучыце "
-"іншую тэчку."
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Памылка стварэння тэчкі"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Тып стану:"
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "Вылучыце дапушчальную тэчку."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "Тэчка"
 
-#: dialogs/codegenerationwizard.cpp:184
-#, fuzzy
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Канчатковая тэчка існуе, але ў вас адсутнічаюць правы на запіс у яе.\n"
-"Зменіце правы або тэчку."
-
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Памылка запісу ў тэчку высновы"
-
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 не з'яўляецца тэчкай. Вылучыце іншую тэчку."
-
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "Вылучыце дапушчальную тэчку"
-
-#: dialogs/overwritedialogue.cpp:27
-#, fuzzy
-msgid "Destination File Already Exists"
-msgstr "Канчатковы файл ужо існуе"
 
-#: dialogs/overwritedialogue.cpp:31
-#, fuzzy
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
+"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 ""
-"Файл %1 ужо існуе ў %2.\n"
-"\n"
-"Вы можаце замяніць яго, захаваць файл пад іншым імем, або не генераваць яго "
-"наогул."
-
-#: dialogs/overwritedialogue.cpp:34
-#, fuzzy
-msgid "&Apply to all remaining files"
-msgstr "Дастасаваць да астатнім файлам"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-#, fuzzy
-msgid "&Overwrite"
-msgstr "Замяніць"
-
-#: dialogs/overwritedialogue.cpp:39
-#, fuzzy
-msgid "&Generate Similar File Name"
-msgstr "Прапанаваць падобнае імя"
-
-#: dialogs/overwritedialogue.cpp:40
-#, fuzzy
-msgid "&Do Not Generate File"
-msgstr "Не генераваць файл"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-#, fuzzy
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Няма даступных параметраў.</p>"
-
-#: associationwidget.cpp:2328
-#, fuzzy
-msgid "Multiplicity"
-msgstr "Множнасць"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-#, fuzzy
-msgid "Enter multiplicity:"
-msgstr "Увядзіце множнасць:"
-
-#: associationwidget.cpp:2346
-#, fuzzy
-msgid "Association Name"
-msgstr "Імя асацыяцыі"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-#, fuzzy
-msgid "Enter association name:"
-msgstr "Увядзіце імя асацыяцыі:"
-
-#: associationwidget.cpp:2366
-#, fuzzy
-msgid "Role Name"
-msgstr "Імя ролі"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-#, fuzzy
-msgid "Enter role name:"
-msgstr "Увядзіце імя ролі:"
-
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "Увядзіце імя аперацыі:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Enter new text:"
-msgstr "Увядзіце новы тэкст:"
-
-#: floatingtextwidget.cpp:175
-#, fuzzy
-msgid "ERROR"
-msgstr "ПАМЫЛКА"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, fuzzy, no-c-format
+msgid "Role Changeability"
+msgstr "Магчымасць змены ролі"
 
-#: floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Change Text"
-msgstr "Змяніць тэкст"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, fuzzy, no-c-format
+msgid "Role Visibility"
+msgstr "Бачнасць ролі"
 
-#: aligntoolbar.cpp:40
-#, fuzzy
-msgid "Align Left"
-msgstr "Выраўнаваць па левым боку"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-#, fuzzy
-msgid "Align Right"
-msgstr "Выраўнаваць па правым боку"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:42
-#, fuzzy
-msgid "Align Top"
-msgstr "Выраўнаваць па верхнім боку"
+#: umbrelloui.rc:13
+#, fuzzy, no-c-format
+msgid "&Diagram"
+msgstr "Дыяграма"
 
-#: aligntoolbar.cpp:43
-#, fuzzy
-msgid "Align Bottom"
-msgstr "Выраўнаваць па ніжнім боку"
+#: umbrelloui.rc:14
+#, fuzzy, no-c-format
+msgid "&New"
+msgstr "Стварыць"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Выраўнаваць вертыкальна (пасярэдзіне)"
+#: umbrelloui.rc:31
+#, fuzzy, no-c-format
+msgid "Sh&ow"
+msgstr "Паказаць"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Выраўнаваць гарызантальна (пасярэдзіне)"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Маштаб:"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Выраўнаваць вертыкальна (пасярэдзіне)"
+#: umbrelloui.rc:43
+#, fuzzy, no-c-format
+msgid "&Code"
+msgstr "Код"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Выраўнаваць гарызантальна (пасярэдзіне)"
+#: umbrelloui.rc:47
+#, fuzzy, no-c-format
+msgid "Active &Language"
+msgstr "Бягучая мова"
 
-#: aligntoolbar.cpp:383
+#: tips:3
 #, fuzzy
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Выраўнаванне можна ўжываць мінімум да двух аб'ектам, напрыклад класам або "
-"акцёрам. Да асацыяцый выраўнаванне ўжываць немагчыма."
+"<p>Сардэчна запрашаем у Umbrello.</p>\n"
+"<p>З дапамогай UML-дыяграм вы зможаце спраектаваць і дакументаваць аб'ектна-"
+"арыентаванае програмное забеспячэнне.  <a href=\"help:/umbrello"
+"\">Кіраўніцтва Umbrello</a> таксама ўтрымоўвае кароткія ўводзіны ў UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 #, fuzzy
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Гэтае зарэзерваванае службовае слова актыўнай мовы."
-
-#: object_factory.cpp:165
-#, fuzzy
-msgid "Reserved Keyword"
-msgstr "Зарэзерваванае ключавое слова"
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Сардэчна запрашаем у 1.5.  У гэтай версіі дададзеная падтрымка асацыяцый, "
+"генератар кода Ruby, магчымасць ператвараць інтэрфейсы ў класы і не толькі.</"
+"p>\n"
 
-#: umlviewimageexporter.cpp:46
+#: tips:17
 #, fuzzy
-msgid "Exporting view..."
-msgstr "Выхад..."
-
-#: umlviewimageexporter.cpp:50
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you "
+"need External Folders then deselect &quot;Use tabbed diagrams&quot; in the "
+"General Settings.</p>\n"
 msgstr ""
+"<p>Немагчыма адначасова выкарыстаць дыяграмы ва ўкладках і знешнія тэчкі. "
+"Калі вы жадаеце выкарыстаць знешнія тэчкі, адключыце параметр \"Выкарыстаць "
+"укладкі\".</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 #, fuzzy
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Вылучаны файл %1 ужо існуе.\n"
-"Замяніць яго?"
-
-#: umlviewimageexporter.cpp:67
-#, fuzzy
-msgid "File Already Exists"
-msgstr "Файл ужо існуе"
-
-#: model_utils.cpp:244
-#, fuzzy
-msgid "new_actor"
-msgstr "new_actor"
-
-#: model_utils.cpp:246
-#, fuzzy
-msgid "new_usecase"
-msgstr "new_usecase"
-
-#: model_utils.cpp:248
-#, fuzzy
-msgid "new_package"
-msgstr "new_package"
-
-#: model_utils.cpp:250
-#, fuzzy
-msgid "new_component"
-msgstr "new_component"
-
-#: model_utils.cpp:252
-#, fuzzy
-msgid "new_node"
-msgstr "new_node"
-
-#: model_utils.cpp:254
-#, fuzzy
-msgid "new_artifact"
-msgstr "new_artifact"
-
-#: model_utils.cpp:256
-#, fuzzy
-msgid "new_interface"
-msgstr "new_interface"
-
-#: model_utils.cpp:258
-#, fuzzy
-msgid "new_datatype"
-msgstr "new_datatype"
-
-#: model_utils.cpp:260
-#, fuzzy
-msgid "new_enum"
-msgstr "new_enum"
-
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "new_entity"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "new_node"
-
-#: model_utils.cpp:268
-#, fuzzy
-msgid "new_object"
-msgstr "new_object"
+"<p>Памер большасці элементаў дыяграм нельга змяніць уручную, гэта будзе "
+"адбывацца аўтаматычна пры неабходнасці каб змясціць утрыманне.\n"
+"Памер блокаў, нататак і паведамленняў дыяграм паслядоўнасцяў змяніць можна, "
+"з дапамогай чырвонага квадраціка.</p>\n"
 
-#: model_utils.cpp:559
+#: tips:30
 #, fuzzy
-msgid "Empty"
-msgstr "Пуста"
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr ""
+"<p>Калі вы жадаеце дадаць наяўны клас у дыяграму, проста перанясіце яго з "
+"дрэва класаў злева.</p>\n"
 
-#: model_utils.cpp:559
+#: tips:36
 #, fuzzy
-msgid "Malformed argument"
-msgstr "Недапушчальны аргумент"
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr ""
+"<p>Утыліта рэарганізацыі дазваляе вам перамяшчаць аперацыі паміж класамі і "
+"іх нашчадкамі/бацькамі.\n"
+"Яе можна выклікаць з кантэкстнага меню класа.</p>\n"
 
-#: model_utils.cpp:560
+#: tips:44
 #, fuzzy
-msgid "Unknown argument type"
-msgstr "Невядомы тып аргументу"
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as "
+"actors.  Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr ""
+"<p>Аб'екты дыяграм паслядоўнасці могуць мець блок дэструктара і малявацца ў "
+"выглядзе дзеючых твараў. Падвойная пстрычка прывядзе да адкрыцця "
+"ўласцівасцяў.</p>\n"
 
-#: model_utils.cpp:560
+#: tips:51
 #, fuzzy
-msgid "Illegal method name"
-msgstr "Недапушчальнае імя метаду"
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object "
+"box (rather than the vertical line) to make it a constructor.</p>\n"
+msgstr ""
+"<p>Паведамленні дыяграмы паслядоўнасцяў могуць выконваць ролю канструктараў. "
+"Пстрыкніце на аб'екце каб зрабіць яго канструктарам.</p>\n"
 
-#: model_utils.cpp:561
+#: tips:57
 #, fuzzy
-msgid "Unknown return type"
-msgstr "Невядомы тып якое вяртаецца значэння"
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Дыяграмы паслядоўнасцяў падтрымліваюць пасылку паведамленняў самім сабе. "
+"Пстрыкніце на той жа вертыкальнай лініі каб стварыць аўтапаведамленне.</p>\n"
 
-#: model_utils.cpp:561
+#: tips:63
 #, fuzzy
-msgid "Unspecified error"
-msgstr "Нявызначаная памылка"
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then "
+"properly populated.\n"
+"</p>\n"
+msgstr ""
+"<p>Калі пры загрузцы знешняга файла спіс пусты, \n"
+"паспрабуйце захаваць мадэль пад іншым імем, \n"
+"зачыніце і паспрабуйце зноў адкрыць захаваны файл.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
+#: tips:71
 #, fuzzy
-msgid "Add Base Class"
-msgstr "Дадаць базавы клас"
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr ""
+"<p>Пры капіяванні або выразанні ў буфер абмену таксама капіюецца PNG-малюнак "
+"дыяграмы, якое можна ўставіць у KWord і іншыя прыкладанні.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
+#: tips:78
 #, fuzzy
-msgid "Add Derived Class"
-msgstr "Дадаць наследуючы клас"
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+"<p>Асацыяцыі не абавязкова павінны быць прамымі лініямі. Пстрыкніце на ёй і "
+"створыцца перасоўваная кропка.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
+#: tips:84
 #, fuzzy
-msgid "Add Operation"
-msgstr "Дадаць аперацыю"
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>Вы можаце ўключыць аўтазахаванне ў наладах Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
+#: tips:90
 #, fuzzy
-msgid "Add Attribute"
-msgstr "Дадаць атрыбут"
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
+msgstr ""
+"<p>Вам чагосьці бракуе ў  Umbrello? Дайце нам ведаць аб гэтым. \n"
+"Паведаміце аб ім праз сістэму адсочвання памылак (\"Паведаміць аб памылцы\" "
+"у меню \"Даведка\", або праз спіс рассылання uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:297
+#: tips:101
 #, fuzzy
-msgid "Add Base Interface"
-msgstr "Дадаць базавы інтэрфейс"
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Вы можаце выдаліць усе вылучаныя аб'екты націскам Del або Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
+#: tips:107
 #, fuzzy
-msgid "Add Derived Interface"
-msgstr "Дадаць наследуючы інтэрфейс"
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr ""
+"<p>Калі вы выявілі памылку ў Umbrello, паведаміце нам аб ёй. \n"
+"Для гэтага можаце скарыстацца адпаведным пунктам у меню Даведка.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
+#: tips:114
 #, fuzzy
-msgid "Base Classifiers"
-msgstr "Базавыя класіфікатары"
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr ""
+"<p>Пры націску Escape актывуецца сродак вылучэння.\n"
+"А пры націску Backspace актывуецца сродак, якое выкарыстоўвалася да гэтага.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
+#: tips:121
 #, fuzzy
-msgid "Derived Classifiers"
-msgstr "Вытворныя класіфікатары"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Немагчыма стварыць тэчку"
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Каб вылучыць усе аб'екты, націсніце Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
+#: tips:127
 #, fuzzy
-msgid "Can not save an empty diagram"
-msgstr "Дыяграма пустая"
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
 msgstr ""
+"<p>Вы можаце стварыць новы клас з дапамогай майстра новых класаў у меню Код."
+"</p>\n"
 
 #, fuzzy
 #~ msgid "new_stereotype"
diff --git a/tde-i18n-br/messages/tdesdk/umbrello.po b/tde-i18n-br/messages/tdesdk/umbrello.po
index 9405ce8b82b..b74a9e306d8 100644
--- a/tde-i18n-br/messages/tdesdk/umbrello.po
+++ b/tde-i18n-br/messages/tdesdk/umbrello.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdesdk/umbrello.pot\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@mandriva.com>\n"
 "Language-Team: br <LL@li.org>\n"
@@ -12,245 +12,197 @@ 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 ""
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Restr da dreuzfurmiñ"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Ar restr XSLT da implij"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Thierry Vignaud, Jañ-Mai Drapier"
 
-#: docgenerators/main.cpp:64
+#: _translatorinfo:2
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Oberourien an ergrafer "
-"UML Umbrello"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Oc'h ezporzh pep well ..."
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: 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/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 "Bez e oa ur gudenn en ur enrollañ ar restr : %1"
-
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Enrollañ ar fazi"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Steudañ d'a-gleiz"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Tra"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Steudañ d'a-zehou"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
 msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
 msgstr ""
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
 msgstr ""
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Eor"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
+msgstr ""
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Skridennad"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
+msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Notenn"
+#: 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:253
-msgid "Box"
-msgstr "Boest"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Emaon o furmadiñ"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
 msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
+#: association.cpp:84
+msgid "Generalization"
 msgstr ""
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
 msgstr ""
 
-#: worktoolbar.cpp:258
-msgid "Directional Association"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
 msgstr ""
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#: association.cpp:88
+msgid "Self Association"
 msgstr ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#: association.cpp:89
+msgid "Collaboration Message"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
+#: association.cpp:90
+msgid "Sequence Message"
 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 "Renkad"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
+#: association.cpp:91
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
 msgstr ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pakad"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Perzh"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Skoulm"
-
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: association.cpp:95
+msgid "Realization"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Etrefas"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr ""
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Seurt ar roadoù"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Eor"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
 msgstr ""
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Adunaniñ"
-
-#: worktoolbar.cpp:278
-msgid "Fork"
+#: associationwidget.cpp:2346
+msgid "Association Name"
 msgstr ""
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Dibab"
-
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
+#: associationwidget.cpp:2366
+msgid "Role Name"
 msgstr ""
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
 msgstr ""
 
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Rannvro"
+#: 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 "Siek eo an anv-se."
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr ""
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "N'eo ket mat an anv"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#: 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 ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Kemennad"
-
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "DIDERMENET"
-
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Dibabit"
+#: 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 "N'eo ket un anv dieil"
 
 #: 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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -268,10 +220,8 @@ msgid "Cannot Open File"
 msgstr "N'hellan ket digeriñ ar restr"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"N'hellan ket krouiñ ar renkell :\n"
+msgid "Cannot create the folder:\n"
+msgstr "N'hellan ket krouiñ ar renkell :\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -283,1266 +233,1496 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "N'hellan ket krouiñ ar renkell"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Roit anv ar stad"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Roit anv ar stad nevez :"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Dibarzhoù hollek"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 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:"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
 msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr ""
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Oc'h enporzh ar restr : %1  Araogenn : %2/%3"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: 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 "Prest."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
 msgstr ""
-"Kemmet eo bet restr-mañ.\n"
-"Hag e fell deoc'h e enrollañ ?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "N'eus ket ur restr %1."
+#: 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 "Renkad"
 
-#: 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 "Fazi en ur kargañ"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Fazi diabarzh"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr ""
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Fazi ereadurezh en ur lenn a-raok '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr ""
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Fazi en ur lenn a-raok '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Bez e oa ur gudenn en ur kargañ ar restr : %1"
-
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Fazi a oa bet pa'z ezkargañ ar restr : %1"
-
-#: umldoc.cpp:934
-msgid "use case diagram"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
 msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
 msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
 msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
 msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 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 "Anv"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+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 "Roit an anv :"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "mankout a ra }"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "N'eo ket mat an anv"
-
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 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"
-msgstr "N'eo ket un anv dieil"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+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."
-msgstr "Siek eo an anv-se."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+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."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
 msgstr ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "N'eo ket un anv dieil"
+#: 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:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Implijit an anv"
+#: 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:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Roit un anv nevez"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Lemel ar skeudenn"
+#: 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 "&Perzhioù"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Emaon o kefluniañ an teul ..."
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr ""
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: 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 "Pennañ"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: 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 "Dibarzhoù hollek"
+
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Roit anv ar gobari"
+#: 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 "Teuliadur"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Roit anv nevez ar gobari :"
+#: 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 "Nodrezh :"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Gweloù"
+#: 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 "Dibarzhoù an nodezhoù"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: 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 "Liv"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Livioù ar widgetoù"
+
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "N'eo ket mat an anv"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr ""
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Lemel an eor"
+
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Adenvel"
+
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Nullaet eo ar c'hrouidigezh"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr ""
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Emaon o kargañ gwell ar roll ..."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr ""
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Red eo goullo ar renkell a-raok lemel ar renkell."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr ""
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "N'eo ket goullo ar renkell"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Anv :"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Rizh :"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "stad nevez"
+#: 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 "Dibarzhoù hollek"
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr ""
+
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Export"
-msgstr "&Ezporzh"
+msgid "Rolename:"
+msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "&Diagram"
+msgid "Multiplicity:"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: 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 "&New"
-msgstr "&Nevez"
+msgid "Public"
+msgstr "Foran"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: 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 "Sh&ow"
-msgstr "Di&skouez"
+msgid "Private"
+msgstr "Prevez"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Kod"
+msgid "Protected"
+msgstr "Gwarezet"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Active &Language"
-msgstr "Yezh &bev"
+msgid "Implementation"
+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
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Documentation"
-msgstr "Teuliadur"
+msgid "Changeable"
+msgstr "Kemmabl"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Slash (//)"
+msgid "Frozen"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Slash-Star (/**  */)"
+msgid "Add only"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Giz :"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Anv ar renkad :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
 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 "Pennañ"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Anv ar p&akad :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Anv an etrefas :"
+
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Anv ar barzh :"
+
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Anv seurt ar roadoù :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr " ..."
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Anv ar &pakad :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "hedad"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract 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\">Hedad</p>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Roll</p>"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Goulev"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>hollek ?</i>"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Dre ziouer"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Leuniañ :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Anv ar renkad"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Levraoueg"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Enlakket ar restr</p></i>"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Taolenn"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Krouidigezh ar raktres"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Gwelusted"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "F&oran"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&revez"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Gwa&rezet"
+
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Anv ar renkad :"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 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 "Foran"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Anv ar barzh :"
 
-#. 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 "Prevez"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Anv ar skoulm :"
 
-#. 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 "Gwarezet"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: 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 ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "N'eo ket un anv dieil"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Oberoù"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Patromoù"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "P&atrom nevez ..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Lemel an eor"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Perzhioù"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Diskouez"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Oberoù"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Gwelusted"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Yezh"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pak&ad"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Renkelloù"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Fur&chal ..."
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&Furchal ..."
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Diskwel"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Diskouez an dibarzhoù"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Dibarzhoù ar patromoù"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Kefluniadur an endalc'had"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Kefluniadur an endalc'had"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr ""
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "renkad_nevez"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Renkad nevez"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr ""
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr ""
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
+msgid "Code Generation Options"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Krouiñ"
+
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Echuiñ"
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "N'eo ket savet"
+
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "N'eo ket savet c'hoazh"
+
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr ""
+"N'eo ket endeo ar renkell %1. Ha fellout a ra deoc'h da krouiñ anezhañ "
+"bremañ ?"
+
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "N'eo ket endev ar renkell ezkas"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Krouiñ ur renkell"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ne krouit ket"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"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 dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Rasklañ ar bolitikerez ?"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Fazi en ur krouiñ ar renkell"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Dibabit ur renkell mad mar plij."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "R&asklañ"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Fazi en ur skrivañ er renkell ezkas"
 
-#. 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/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Go&ulenn"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Dibabit ur renkell mad mar plij"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
+msgid "Code Viewer"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Implijit un anv all"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Emaon o furmadiñ"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Sil"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linennoù"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Diuzadenn"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
-"Prenestr (\"\\r\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Rannvro"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Perzh"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Blavennig"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Egor"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Comment Verbosity"
+msgid "The format that the images will be exported to"
 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/notedialog.cpp:25
+msgid "Note Documentation"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Ar restr dehaezadur a zo endeo"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"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 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 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/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Rasklañ"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Dibarzhoù ar yezh"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Ne krouit &ket ar restr"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Dibarzhoù an rannbennad"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Seurt :"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Anv :"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Dibab ar renkadoù"
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Renkadoù dibabet"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Renkadoù da gaout"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 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:30
+msgid "Umbrello Setup"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Etrefas arveriad"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface 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:54
+msgid "Line color:"
+msgstr "Liv al linenn :"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Liv dr&e ziouer"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Leuniañ al liv :"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Liv dre &ziouer"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Ledander al linenn :"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Ledander dr&e ziouer"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Implij leuniañ al liv"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 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:112
+msgid "Use tabbed diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Livioù"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Nodrezh :"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Enrollañ ent emgefreek"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Paper :"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Diuzet :"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+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:146
+msgid "Set autosave suffix:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
+#: dialogs/settingsdlg.cpp:148
+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>"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Loc'hadur"
+
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logo loc&'hañ"
+
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Lagadenn an deiz"
+
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Kargañ ar raktres diwezhañ"
+
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Loc'hañ ur raktres gant :"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Anv :"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zoom :"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Kefluniadur ar renkad"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Diskouez ar pakad"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Diskouez ar &gael"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
 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/settingsdlg.cpp:294
+msgid "Code Generation"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Ledander al linenn :  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Ezporzh pep well ..."
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Rizh ar stad :"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Anv ar stad :"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Liv ar widget"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 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/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Rizh ar skeudenn :"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Foran"
 
-#. 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/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Gwar&ezet"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Implijit &renkelloù"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen 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/umlattributedialog.cpp:164
+msgid "Attribute 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/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Gwerzh dre ziouer :"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Hirder/Gwerzhioù :"
+
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 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/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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/umlentityattributedialog.cpp:92
+msgid "Attributes:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Kemmabl"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "O sevel ar meneger"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Hini ebet"
+
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Kentañ"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Meneger"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Dieil"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
 msgstr ""
 
-#: tips.txt:3
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 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/umloperationdialog.cpp:50
+msgid "Operation Properties"
 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/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 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/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 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/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Rannbennadoù"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Rannbennad ne&vez ..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
 msgstr ""
 
-#: tips.txt:37
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "N'eo ket mat anv an rannbennad"
+
+#: dialogs/umloperationdialog.cpp:339
 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"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
 
-#: tips.txt:43
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "N'eo ket dieil anv an rannbennad"
+
+#: dialogs/umloperationdialog.cpp:406
 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"
+"The parameter name you have chosen is already being used in this operation."
 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/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
 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"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
 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"
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
 msgstr ""
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Dibarzhoù ar patrom"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
 msgstr ""
 
-#: tips.txt:86
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "N'eo ket mat anv ar patrom"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 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"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "N'eo ket dieil anv ar patrom"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
 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"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
 msgstr ""
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "N'eo ket un anv dieil"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linenn :"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Leuniañ :"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Dr&e ziouer"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Oc'h ezporzh pep well ..."
+
+#: 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:108
+#: 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 "Bez e oa ur gudenn en ur enrollañ ar restr : %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Enrollañ ar fazi"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Restr da dreuzfurmiñ"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Ar restr XSLT da implij"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Oberourien an ergrafer "
+"UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+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 "Anv"
+
+#: 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 "Roit an anv :"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Roit ar skrid nevez :"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "FAZI"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Kemmañ ar skrid"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "N'eus ket endeo ar restrrenkell %1."
+
+#: 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 "Fazi en ur kargañ"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -1597,6 +1777,10 @@ msgstr ""
 msgid "Select Operation..."
 msgstr ""
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Kemmañ ar skrid ..."
@@ -1646,6 +1830,19 @@ msgstr "Nevez"
 msgid "Rename..."
 msgstr "Adenvel ..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Pegañ ar fazi"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Liv al linenn ..."
@@ -1674,14 +1871,26 @@ msgstr ""
 msgid "Import Classes..."
 msgstr "Enporzh ar renkadoù ..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pakad"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Isreiziad"
 
+#: 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 "Skoulm"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1690,10 +1899,18 @@ msgstr ""
 msgid "Folder"
 msgstr "Renkell"
 
+#: 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 ""
@@ -1730,6 +1947,18 @@ msgstr ""
 msgid "Export as Picture..."
 msgstr "Ezporzh er skeudenn ..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Etrefas"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Seurt ar roadoù"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr ""
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr ""
@@ -1750,26 +1979,10 @@ msgstr ""
 msgid "Collaboration Diagram..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr ""
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Oberoù"
-
 #: 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 "Gwelusted"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr ""
@@ -1782,11 +1995,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Diskouez"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1811,14 +2019,6 @@ msgstr "Leuniañ al liv ..."
 msgid "Use Fill Color"
 msgstr "Implij leuniañ al liv"
 
-#: 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 "Liv"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1847,10 +2047,26 @@ msgstr ""
 msgid "Package..."
 msgstr "Pakad ..."
 
+#: 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 "Rannvro ..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Isreiziad ..."
@@ -1895,6 +2111,14 @@ msgstr "Lemel an eor"
 msgid "Change Association Name..."
 msgstr ""
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr ""
@@ -1929,8 +2153,8 @@ 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
@@ -1938,184 +2162,93 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 Oberourien an ergrafer UML Umbrello"
 
-#: 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 "N'eus ket endeo ar restrrenkell %1."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Thierry Vignaud, Jañ-Mai Drapier"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
-
-#: 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 "Prest."
-
-#: 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
-msgid "Namespace"
+#: model_utils.cpp:244
+msgid "new_actor"
 msgstr ""
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Oc'h enporzh ar restr : %1  Araogenn : %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Fazi diabarzh"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Fazi ereadurezh en ur lenn a-raok '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Fazi en ur lenn a-raok '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: model_utils.cpp:246
+msgid "new_usecase"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr ""
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "pakad_nevez"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
+#: model_utils.cpp:250
+msgid "new_component"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr ""
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "skoulm_nevez"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
+#: model_utils.cpp:254
+msgid "new_artifact"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
+#: model_utils.cpp:256
+msgid "new_interface"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
+#: model_utils.cpp:258
+msgid "new_datatype"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
+#: model_utils.cpp:260
+msgid "new_enum"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
+#: model_utils.cpp:262
+msgid "new_entity"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "renkell_nevez"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "mankout a ra }"
-
-#: 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 "Goullonderiñ"
 
-#: 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"
-msgstr ""
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "N'eo ket spisaet ar fazi"
 
-#: 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
@@ -2130,101 +2263,66 @@ msgstr "Roit anv an dra :"
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Dibarzhoù hollek"
-
-#: 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 ""
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Ouzhpennañ ur renkad diazez"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
 msgstr ""
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
 msgstr ""
 
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Roit anv ar skeudenn"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Roit anv nevez ar skeudenn :"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
 msgstr ""
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Lemel ar skeudenn ?"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Nullet eo an adenvel"
-
-#: 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"
-msgstr ""
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Roit anv ar stad"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr ""
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Roit anv ar stad nevez :"
 
-#: 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"
-msgstr ""
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "stad nevez"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2378,11 +2476,6 @@ msgstr "&Ezporzh er skeudenn ..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Perzhioù"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2467,14 +2560,21 @@ msgstr "&Teuliadur"
 msgid "Opening file..."
 msgstr "Emaon o tigeriñ ur restr ..."
 
+#: 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 "Emaon o krouiñ un teul nevez ..."
 
 #: 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"
@@ -2501,6 +2601,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2509,6 +2613,10 @@ msgstr ""
 "N'eus ket ur restr %1.\n"
 "C'hoant ho peus e rasklañ ?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Rasklañ"
@@ -2544,8 +2652,8 @@ msgstr ""
 
 #: 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
@@ -2600,1226 +2708,1219 @@ msgstr "Pep restr"
 msgid "Select Code to Import"
 msgstr "Dibab ar c'hod da enporzh"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Anv ar renkad :"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Anv ar p&akad :"
-
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Anv an etrefas :"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Anv ar barzh :"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Anv seurt ar roadoù :"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Anv ar &pakad :"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Goulev"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Kemmet eo bet restr-mañ.\n"
+"Hag e fell deoc'h e enrollañ ?"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Dre ziouer"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "N'eus ket ur restr %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Levraoueg"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Taolenn"
+#: 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:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "F&oran"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&revez"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Bez e oa ur gudenn en ur kargañ ar restr : %1"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Gwa&rezet"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Fazi a oa bet pa'z ezkargañ ar restr : %1"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Anv ar renkad :"
-
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
+#: umldoc.cpp:942
+msgid "state diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Anv ar barzh :"
-
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Anv ar skoulm :"
-
-#: 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:944
+msgid "activity diagram"
 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:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "N'eo ket un anv dieil"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linenn :"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Leuniañ :"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Dr&e ziouer"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Adenvel"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr ""
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Implijit an anv"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Roit un anv nevez"
+
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 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 "Dibarzhoù hollek"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Lemel ar skeudenn"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Emaon o kefluniañ an teul ..."
+
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 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 "Dibarzhoù an nodezhoù"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Dibarzhoù ar patrom"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+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 "Dibarzhoù hollek"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Roit anv ar gobari"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Seurt :"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Roit anv nevez ar gobari :"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Anv :"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Gweloù"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "N'eo ket mat anv ar patrom"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "N'eo ket mat an anv"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "N'eo ket dieil anv ar patrom"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Nullaet eo ar c'hrouidigezh"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr ""
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Emaon o kargañ gwell ar roll ..."
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Gwerzh dre ziouer :"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Red eo goullo ar renkell a-raok lemel ar renkell."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Hirder/Gwerzhioù :"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "N'eo ket goullo ar renkell"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Nullet eo an adenvel"
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "O sevel ar meneger"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Hini ebet"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Roit anv ar skeudenn"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Kentañ"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Roit anv nevez ar skeudenn :"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Meneger"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Dieil"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Lemel ar skeudenn ?"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr ""
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Oc'h ezporzh ar well ..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr ""
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Ar restr a zo endeo"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Diskwel"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "N'hellan ket krouiñ ar renkell : %1."
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: 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/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: 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/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Rizh :"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Tra"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Etrefas arveriad"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Liv al linenn :"
-
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Liv dr&e ziouer"
-
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Leuniañ al liv :"
-
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Liv dre &ziouer"
-
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Ledander al linenn :"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Skridennad"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Ledander dr&e ziouer"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Notenn"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Implij leuniañ al liv"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Boest"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
+#: worktoolbar.cpp:257
+msgid "Relationship"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Enrollañ ent emgefreek"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr ""
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Adunaniñ"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: worktoolbar.cpp:278
+msgid "Fork"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Loc'hadur"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logo loc&'hañ"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Lagadenn an deiz"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Kargañ ar raktres diwezhañ"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Loc'hañ ur raktres gant :"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Dibab"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr ""
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Kemennad"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr ""
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "DIDERMENET"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr ""
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Dibabit"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Ober"
+
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Kefluniadur ar renkad"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Lemel ar skeudenn"
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Dibarzhoù hollek"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
+#: autolayout/newautolayoutdialog.ui:238
+#, no-c-format
+msgid "Association as Ed&ges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Diskouez ar pakad"
-
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Dre ziouer"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Giz :"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Gwar&ezet"
-
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Rannbennadoù"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Rannbennad ne&vez ..."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "N'eo ket mat anv an rannbennad"
-
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr " ..."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "N'eo ket dieil anv an rannbennad"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "hedad"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Hedad</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Roll</p>"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>hollek ?</i>"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Anv ar renkad"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Enlakket ar restr</p></i>"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr ""
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Krouidigezh ar raktres"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Patromoù"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "P&atrom nevez ..."
-
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Yezh"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Livioù ar widgetoù"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Renkelloù"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Fur&chal ..."
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Foran"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&Furchal ..."
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Rasklañ ar bolitikerez ?"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
+#: 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/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "R&asklañ"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Go&ulenn"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Sil"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Implijit un anv all"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
+#: 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/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Emaon o furmadiñ"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linennoù"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Diuzadenn"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Prenestr (\"\\r\\n\")"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Diskouez an dibarzhoù"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Blavennig"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Dibarzhoù ar patromoù"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Egor"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Kefluniadur an endalc'had"
-
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: 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/classpropdlg.cpp:222
-msgid "Class Associations"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Oberoù"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Gwelusted"
-
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pak&ad"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Dibarzhoù ar yezh"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr ""
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Dibab ar renkadoù"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr ""
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Renkadoù dibabet"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Rizh ar stad :"
-
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Anv ar stad :"
-
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Liv ar widget"
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "renkad_nevez"
-
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Renkad nevez"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Renkadoù da gaout"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
 msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Dibarzhoù an rannbennad"
-
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Krouiñ"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Echuiñ"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "N'eo ket savet"
-
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "N'eo ket savet c'hoazh"
-
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
-"N'eo ket endeo ar renkell %1. Ha fellout a ra deoc'h da krouiñ anezhañ bremañ ?"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "N'eo ket endev ar renkell ezkas"
-
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Krouiñ ur renkell"
-
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ne krouit ket"
-
-#: 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."
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Fazi en ur krouiñ ar renkell"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Livioù"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Dibabit ur renkell mad mar plij."
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Nodrezh :"
 
-#: 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 ""
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Paper :"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Fazi en ur skrivañ er renkell ezkas"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Diuzet :"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Dibabit ur renkell mad mar plij"
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Ar restr dehaezadur a zo endeo"
-
-#: 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/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Rasklañ"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Ne krouit &ket ar restr"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
 msgstr ""
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zoom :"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Diskouez ar &gael"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
 msgstr ""
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
+#: 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 ""
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Roit ar skrid nevez :"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "FAZI"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Kemmañ ar skrid"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Steudañ d'a-gleiz"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Steudañ d'a-zehou"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Ledander al linenn :  "
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Ezporzh pep well ..."
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Rizh ar skeudenn :"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Implijit &renkelloù"
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: aligntoolbar.cpp:383
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"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 ""
 
-#: object_factory.cpp:164
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Oc'h ezporzh ar well ..."
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Ezporzh"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: umlviewimageexporter.cpp:66
-msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
 msgstr ""
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Ar restr a zo endeo"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr ""
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nevez"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr ""
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Di&skouez"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "pakad_nevez"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zoom :"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr ""
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kod"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "skoulm_nevez"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Yezh &bev"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: 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:256
-msgid "new_interface"
+#: 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:258
-msgid "new_datatype"
+#: 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:260
-msgid "new_enum"
+#: 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:262
-msgid "new_entity"
+#: 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:264
-msgid "new_folder"
-msgstr "renkell_nevez"
-
-#: model_utils.cpp:268
-msgid "new_object"
+#: 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:559
-msgid "Empty"
-msgstr "Goullonderiñ"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: 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:560
-msgid "Unknown argument type"
+#: 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 ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: 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 ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "N'eo ket spisaet ar fazi"
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Ouzhpennañ ur renkad diazez"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
+#: 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:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
+#: 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:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base 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:298
-msgid "Add Derived Interface"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base 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 ""
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
+#: 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:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "N'hellan ket krouiñ ar renkell : %1."
-
-#: 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"
diff --git a/tde-i18n-bs/messages/tdesdk/umbrello.po b/tde-i18n-bs/messages/tdesdk/umbrello.po
index 1fac67bbc78..11d1d8a45b9 100644
--- a/tde-i18n-bs/messages/tdesdk/umbrello.po
+++ b/tde-i18n-bs/messages/tdesdk/umbrello.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2003-08-09 18:49+0200\n"
 "Last-Translator: Emir Habul <emirhabul@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -15,251 +15,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
 
-#: docgenerators/main.cpp:47
-msgid "File to transform"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
 
-#: 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 ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
+#: aligntoolbar.cpp:41
+msgid "Align Right"
 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:42
+msgid "Align Top"
 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:43
+msgid "Align Bottom"
 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"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekat"
-
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
 msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 msgstr ""
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Udruženje"
-
-#: association.cpp:93 worktoolbar.cpp:249
-#, fuzzy
-msgid "Containment"
-msgstr "Komponenta"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
+msgstr ""
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Sidro"
+#: 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:251
-msgid "Label"
+#: aligntoolbar.cpp:384
+msgid "Information"
 msgstr ""
 
-#: worktoolbar.cpp:252
-#, fuzzy
-msgid "Note"
-msgstr "Bilješka"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kutija"
+#: association.cpp:84
+msgid "Generalization"
+msgstr ""
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Učesnik"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
 
 #: association.cpp:86 worktoolbar.cpp:255
 msgid "Dependency"
 msgstr "Zavisnost"
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
-msgstr ""
-
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr ""
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Udruženje"
 
-#: worktoolbar.cpp:258
+#: association.cpp:88
 #, fuzzy
-msgid "Directional Association"
+msgid "Self Association"
 msgstr "Udruženje"
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr ""
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompozijcija"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "Klasa"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
+#: association.cpp:89
+msgid "Collaboration Message"
 msgstr ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr ""
+#: association.cpp:90
+#, fuzzy
+msgid "Sequence Message"
+msgstr "Poruka"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
+#: association.cpp:91
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
+#: association.cpp:93 worktoolbar.cpp:249
+#, fuzzy
+msgid "Containment"
 msgstr "Komponenta"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-#, fuzzy
-msgid "Node"
-msgstr "Bilješka"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompozijcija"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: association.cpp:95
+msgid "Realization"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interface"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr ""
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-#, fuzzy
-msgid "Datatype"
-msgstr "Stanje"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Sidro"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-#, fuzzy
-msgid "Entity"
-msgstr "Kraj aktivnosti"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr "Aktivnost"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr ""
+#: associationwidget.cpp:2346
+#, fuzzy
+msgid "Association Name"
+msgstr "Udruženje"
 
-#: worktoolbar.cpp:278
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 #, fuzzy
-msgid "Fork"
-msgstr "Račvati/udružiti"
+msgid "Enter association name:"
+msgstr "Udruženje"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: associationwidget.cpp:2366
+msgid "Role Name"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
 msgstr ""
 
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Aktivnost prelaza"
-
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
-msgstr "Aktivnost"
-
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stanje"
-
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
+#: 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 ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#: 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 ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Poruka"
-
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: 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 ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
+#: 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 ""
 
 #: 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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -277,8 +227,7 @@ msgid "Cannot Open File"
 msgstr ""
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
+msgid "Cannot create the folder:\n"
 msgstr ""
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
@@ -291,1267 +240,1498 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
 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:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: 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 ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
 msgstr ""
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr ""
+#: 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 "Klasa"
 
-#: 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"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
 msgstr ""
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
 msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
 msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
 msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
 msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
 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"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 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:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 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"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
 msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
 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"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:2374
+#, fuzzy
+msgid "Class name expected"
+msgstr "Klasa"
 
-#: 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."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
 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."
+#: 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:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: 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 "Use Name"
-msgstr "Koristi veličinu slova"
+msgid "Properties"
+msgstr "Interface"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Enter New Name"
-msgstr "Udruženje"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Inicijalna aktivnost"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Kraj aktivnosti"
+
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
+#: 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 ""
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: 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 ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
+#: 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 ""
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: 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"
 msgstr ""
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
+#: 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 ""
 
-#: umllistview.cpp:416
-#, fuzzy
-msgid "Enter Model Name"
-msgstr "Udruženje"
+#: 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 ""
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
 msgstr ""
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+msgid "Delete"
 msgstr ""
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
 msgstr ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
 msgstr ""
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
 msgstr ""
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
 msgstr ""
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: association.cpp:88
+#: 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 ""
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr ""
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr ""
+
+#: dialogs/assocpropdlg.cpp:112
 #, fuzzy
-msgid "Self Association"
+msgid "Association font"
 msgstr "Udruženje"
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 msgstr ""
 
-#: association.cpp:90
-#, fuzzy
-msgid "Sequence Message"
-msgstr "Poruka"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Export"
+msgid "Rolename:"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "&Diagram"
+msgid "Multiplicity:"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: 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 "&New"
+msgid "Public"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: 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 "Sh&ow"
+msgid "Private"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
+msgid "Protected"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Active &Language"
+msgid "Implementation"
 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
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Documentation"
+msgid "Changeable"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Slash (//)"
+msgid "Frozen"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Slash-Star (/**  */)"
+msgid "Add only"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
 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"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Method Body Generation"
-msgstr "Udruženje"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "vector"
-msgstr "Učesnik"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
+#: dialogs/classgenpage.cpp:66
+#, fuzzy
+msgid "Datatype &name:"
+msgstr "Stanje"
+
+#: dialogs/classgenpage.cpp:68
+#, fuzzy
+msgid "Entity &name:"
+msgstr "Stanje"
+
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
 #, no-c-format
-msgid "qstring.h"
+msgid "&File"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Class name"
-msgstr "Klasa"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, fuzzy, no-c-format
-msgid "Association accessor methods"
-msgstr "Udruženje"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
 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"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 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"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
 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"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: 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 ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
 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/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+msgid "&Delete"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, 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:"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
 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/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
 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/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Komponenta"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr ""
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr ""
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr ""
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr ""
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr ""
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
+msgid "Code Generation Options"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Napravi pogled"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"*NIX (\"\\n\")"
+"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 dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr ""
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"Windows (\"\\r\\n\")"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, fuzzy, no-c-format
-msgid "Space"
+msgid "Code Viewer"
+msgstr "Napravi pogled"
+
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
 msgstr "Stanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 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/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr ""
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr ""
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"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 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 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/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 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:30
+msgid "Umbrello Setup"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "Napravi pogled"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
 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:60
+msgid "D&efault Color"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
 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:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Udruženje"
+
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr ""
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
 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/settingsdlg.cpp:294
+msgid "Code Generation"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Inicijalno stanje"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Kraj stanja"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 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/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
 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/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, fuzzy, no-c-format
-msgid "Role Properties"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr ""
+
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
 msgstr "Interface"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
 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/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 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/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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/umlentityattributedialog.cpp:92
+msgid "Attributes:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "Bilješka"
+
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 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/umlentityattributedialog.cpp:121
+msgid "&Unique"
 msgstr ""
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 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/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
 msgstr ""
 
-#: tips.txt:19
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 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/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 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/umloperationdialog.cpp:50
+msgid "Operation Properties"
 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/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 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/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 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/umloperationdialog.cpp:120
+msgid "Parameters"
 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"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
 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"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
 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"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
 msgstr ""
 
-#: tips.txt:71
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 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"
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid 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"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr ""
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, fuzzy, no-c-format
+msgid "Role Properties"
+msgstr "Interface"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
 msgstr ""
 
-#: tips.txt:103
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: tips.txt:108
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+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 ""
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr ""
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr ""
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+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 ""
+
+#: 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 ""
+
+#: floatingtextwidget.cpp:112
+#, fuzzy
+msgid "Enter operation name:"
+msgstr "Udruženje"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr ""
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr ""
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr ""
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr ""
+
+#: 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 ""
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -1607,6 +1787,10 @@ msgstr ""
 msgid "Select Operation..."
 msgstr ""
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr ""
@@ -1657,6 +1841,18 @@ msgstr ""
 msgid "Rename..."
 msgstr ""
 
+#: 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 ""
@@ -1685,15 +1881,28 @@ msgstr ""
 msgid "Import Classes..."
 msgstr ""
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr ""
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
 msgid "Component Diagram..."
 msgstr "Komponenta"
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#, fuzzy
+msgid "Node"
+msgstr "Bilješka"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1702,11 +1911,20 @@ msgstr ""
 msgid "Folder"
 msgstr ""
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Kraj aktivnosti"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Klasa"
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Učesnik"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr ""
@@ -1743,6 +1961,19 @@ msgstr ""
 msgid "Export as Picture..."
 msgstr ""
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interface"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+#, fuzzy
+msgid "Datatype"
+msgstr "Stanje"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr ""
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
 msgid "Class Diagram..."
@@ -1764,26 +1995,10 @@ msgstr ""
 msgid "Collaboration Diagram..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr ""
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr ""
-
 #: 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 ""
@@ -1796,11 +2011,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr ""
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1825,14 +2035,6 @@ msgstr ""
 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 ""
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1861,10 +2063,26 @@ msgstr ""
 msgid "Package..."
 msgstr ""
 
+#: 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 ""
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr ""
@@ -1911,6 +2129,14 @@ msgstr ""
 msgid "Change Association Name..."
 msgstr "Udruženje"
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr ""
@@ -1945,193 +2171,101 @@ 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 ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: 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 ""
-
-#: 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
-msgid "Namespace"
-msgstr ""
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
+#: model_utils.cpp:244
+msgid "new_actor"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: model_utils.cpp:246
+msgid "new_usecase"
 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:248
+msgid "new_package"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
+#: model_utils.cpp:250
+msgid "new_component"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
+#: model_utils.cpp:252
+msgid "new_node"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
+#: model_utils.cpp:254
+msgid "new_artifact"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
+#: model_utils.cpp:256
+msgid "new_interface"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
+#: model_utils.cpp:258
+msgid "new_datatype"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
+#: model_utils.cpp:260
+msgid "new_enum"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
+#: model_utils.cpp:262
+msgid "new_entity"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
+#: model_utils.cpp:264
+msgid "new_folder"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
+#: model_utils.cpp:268
+msgid "new_object"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: model_utils.cpp:560
+msgid "Illegal method name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-#, fuzzy
-msgid "Class name expected"
-msgstr "Klasa"
-
-#: 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
@@ -2147,101 +2281,69 @@ msgstr ""
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr ""
-
-#: 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"
-msgstr ""
-
-#: umlview.cpp:2578
+#: refactoring/refactoringassistant.cpp:289
 #, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Udruženje"
+msgid "Add Base Class"
+msgstr "Interface"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:290
+#, fuzzy
+msgid "Add Derived Class"
+msgstr "Interface"
 
-#: 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"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:297
+#, fuzzy
+msgid "Add Base Interface"
+msgstr "Interface"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
+#: refactoring/refactoringassistant.cpp:298
+#, fuzzy
+msgid "Add Derived Interface"
+msgstr "Interface"
 
-#: 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
@@ -2397,11 +2499,6 @@ msgstr ""
 msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr ""
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2487,14 +2584,21 @@ msgstr ""
 msgid "Opening file..."
 msgstr ""
 
+#: 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 ""
 
 #: 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"
@@ -2521,12 +2625,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 ""
@@ -2562,8 +2674,8 @@ msgstr ""
 
 #: 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
@@ -2618,1239 +2730,1225 @@ msgstr ""
 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
-#, fuzzy
-msgid "Datatype &name:"
-msgstr "Stanje"
-
-#: dialogs/classgenpage.cpp:68
-#, fuzzy
-msgid "Entity &name:"
-msgstr "Stanje"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
+#: umldoc.cpp:108
+msgid "Component View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
+#: 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:256
-msgid "Class name:"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 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:942
+msgid "state diagram"
 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:944
+msgid "activity diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
+#: umldoc.cpp:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr ""
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Koristi veličinu slova"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr ""
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Udruženje"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 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"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 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"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
+#: umllistview.cpp:416
 #, fuzzy
-msgid "Association font"
+msgid "Enter Model Name"
 msgstr "Udruženje"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-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 ""
-
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
+#: umllistview.cpp:1007
+msgid "Views"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-#, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Interface"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-#, fuzzy
-msgid "&None"
-msgstr "Bilješka"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr ""
+#: umlview.cpp:2578
+#, fuzzy
+msgid "Enter Diagram Name"
+msgstr "Udruženje"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr ""
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
+#: 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:63
-msgid "Fill color:"
+#: 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:69
-msgid "De&fault Color"
-msgstr ""
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekat"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
+#: worktoolbar.cpp:251
+msgid "Label"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr ""
+#: worktoolbar.cpp:252
+#, fuzzy
+msgid "Note"
+msgstr "Bilješka"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr ""
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kutija"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:257
+msgid "Relationship"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:258
 #, fuzzy
-msgid "Use angular association lines"
+msgid "Directional Association"
 msgstr "Udruženje"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr ""
-
-#: 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 ""
-"<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 ""
-
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
+#: worktoolbar.cpp:277
+msgid "Join"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr ""
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Račvati/udružiti"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr ""
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "Aktivnost prelaza"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr ""
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Poruka"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
+#: worktoolbar.cpp:302
+msgid "Select"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Prelaz stanja"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Udruženje"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
+#: autolayout/newautolayoutdialog.ui:183
+#, no-c-format
+msgid "Generalization as Ed&ges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Udruženje"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
+#: autolayout/newautolayoutdialog.ui:412
+#, no-c-format
+msgid "&Restore Default"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, fuzzy, no-c-format
+msgid "Method Body Generation"
+msgstr "Udruženje"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, fuzzy, no-c-format
+msgid "vector"
+msgstr "Učesnik"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, fuzzy, no-c-format
+msgid "Class name"
+msgstr "Klasa"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr ""
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, fuzzy, no-c-format
+msgid "Association accessor methods"
+msgstr "Udruženje"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Inicijalna aktivnost"
-
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Kraj aktivnosti"
-
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
+#: 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/selectopdlg.cpp:46
-msgid "Class operation:"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
+#: 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/diagramprintpage.cpp:57
-msgid "&Select diagrams"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:398
+#, fuzzy, no-c-format
+msgid "Space"
+msgstr "Stanje"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: 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/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Inicijalno stanje"
-
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Kraj stanja"
-
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Napravi pogled"
-
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: 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."
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+"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 ""
 
-#: 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/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
 msgstr ""
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
 msgstr ""
 
-#: associationwidget.cpp:2346
-#, fuzzy
-msgid "Association Name"
-msgstr "Udruženje"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-#, fuzzy
-msgid "Enter association name:"
-msgstr "Udruženje"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "Udruženje"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
 msgstr ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
 msgstr ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: umbrelloui.rc:35
+#, no-c-format
+msgid "&Zoom"
 msgstr ""
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
 msgstr ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
 msgstr ""
 
-#: aligntoolbar.cpp:383
+#: tips:3
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr ""
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr ""
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
+"<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 ""
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr ""
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr ""
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr ""
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr ""
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr ""
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr ""
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr ""
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr ""
-
-#: model_utils.cpp:258
-msgid "new_datatype"
+"<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:260
-msgid "new_enum"
-msgstr ""
-
-#: model_utils.cpp:262
-msgid "new_entity"
+#: 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:264
-msgid "new_folder"
+#: 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:268
-msgid "new_object"
+#: 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:559
-msgid "Empty"
+#: 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 ""
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: 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 ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: 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 ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: 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 ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:289
-#, fuzzy
-msgid "Add Base Class"
-msgstr "Interface"
-
-#: refactoring/refactoringassistant.cpp:290
-#, fuzzy
-msgid "Add Derived Class"
-msgstr "Interface"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
+#: 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:297
-#, fuzzy
-msgid "Add Base Interface"
-msgstr "Interface"
-
-#: refactoring/refactoringassistant.cpp:298
-#, fuzzy
-msgid "Add Derived Interface"
-msgstr "Interface"
-
-#: 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 ""
 
 #, fuzzy
@@ -3882,9 +3980,6 @@ msgstr ""
 #~ msgid "Form1"
 #~ msgstr "Račvati/udružiti"
 
-#~ msgid "State transition"
-#~ msgstr "Prelaz stanja"
-
 #~ msgid "Branch/merge"
 #~ msgstr "Razgranati/Sjediniti"
 
diff --git a/tde-i18n-ca/messages/tdesdk/umbrello.po b/tde-i18n-ca/messages/tdesdk/umbrello.po
index 2e27cd9603f..e78b0ba608a 100644
--- a/tde-i18n-ca/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ca/messages/tdesdk/umbrello.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-09-30 10:51+0200\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -19,245 +19,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Generador de codi autònom del modelador UML Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Fitxer a transformar"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "El fitxer XSLT a usar"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Autors del modelador UML "
-"Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autors del modelador UML Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Antoni Bella Pérez,Albert Astals Cid"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Exporta totes les vistes..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "bella5@teleline.es,astals11@terra.es"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "S'han generat alguns errors en exportar les imatges:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Introduïu el nom de l'activitat"
 
-#: 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 "Hi ha hagut un problema desant el fitxer: %1"
+#: 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 "Introduïu el nom de la nova activitat:"
 
-#: 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 "Error mentre es desava"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Alinea a l'esquerra"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objecte"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Alinea a la dreta"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Missatge síncron"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Alinea a dalt"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Missatge asíncron"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alinea a baix"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Associació"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Alinea al mig verticalment"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Contenció"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Alinea al mig horitzontalment"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ancoratge"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Distribució alineada verticalment"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etiqueta"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Distribució alineada horitzontalment"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Nota"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Per a l'alineació almenys haureu de tenir escollits 2 objectes com a classes "
+"o actors. No podeu alinear associacions."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Caixa"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Format"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dependència"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalització"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregació"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relació"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Associació direccional"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementació (generalització/especialització)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composició"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Casos d'ús"
-
-#. 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 "Classe"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Estat inicial"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Estat final"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Branca/fusiona"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Ramifica/uneix"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paquet"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Component"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Node"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dependència"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefacte"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Associació"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfície"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Auto associació"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tipus de dada"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Missatge de col·laboració"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enum"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Diagrama de seqüència"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entitat"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Auto missatge de col·laboració"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Historia profunda"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Auto missatge de seqüència"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Historia superficial"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Contenció"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Join"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composició"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Bifurcació"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realització"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Unió"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Associació uni."
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Elecció"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ancoratge"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Estat de transició"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Activitat de transició"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Activitat"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Estat"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicitat"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Activitat final"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Introduïu multiplicitat:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Activitat inicial"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nom de l'associació"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Missatge"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Introduïu el nom de l'associació:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "SENSE DEFINIR"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nom de rol"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Selecció"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Introduïu nom de rol:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Ja existeix una operació amb el mateix nom i signatura. No podeu afegir-la "
+"de nou."
+
+#: 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 "Aquest nom no és vàlid."
+
+#: 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 "Nom no vàlid"
+
+#: 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 "Aquest nom ja s'està usant."
+
+#: 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 "No és un nom únic"
 
 #: 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."
+"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 ""
 "Almenys un dels ítems del portapapers no ha pogut ser enganxat perquè ja "
 "n'existeix un altre amb el mateix nom. Qualsevol altre ítem si que ha estat "
@@ -272,18 +232,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"No es pot obrir el fitxer %1 per a escriptura. Si us plau, assegureu-vos que la "
-"carpeta existeix i que hi teniu permisos d'escriptura."
+"No es pot obrir el fitxer %1 per a escriptura. Si us plau, assegureu-vos que "
+"la carpeta existeix i que hi teniu permisos d'escriptura."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "No es pot obrir el fitxer"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"No es pot crear la carpeta:\n"
+msgid "Cannot create the folder:\n"
+msgstr "No es pot crear la carpeta:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -297,1360 +255,1523 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "No es pot crear la carpeta"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Introduïu el nom de l'estat"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Opcions generals"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Introduïu el nom del nou estat:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paquet és un espai de nom"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Introduïu activitat"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Destructors virtuals"
 
-#: 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 "Introduïu el nom de la nova activitat:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Genera constructors buits"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "activitat nova"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Genera mètodes accessor"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Model UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operacions són incloses"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Vista lògica"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Accessors són inclosos"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Vista casos d'ús"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Accessors són públics"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Vista component"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "S'està important el fitxer: %1 Progrés %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Vista desplegament"
+#: 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 "Llest."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model entitat relació"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "És l'àmbit %1 un espai de noms o una classe?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipus de dades"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "La importació de C++ requereix la vostra ajuda"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"El fitxer actual ha estat modificat.\n"
-"Desitgeu desar-lo?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Espai de nom"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "El fitxer %1 no existeix."
+#: 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 "Classe"
 
-#: 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 "Error de càrrega"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Error intern"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "El fitxer %1 sembla estar corrupte."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Error de sintaxi abans de '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "No s'ha trobat un fitxer XMI dins del fitxer comprimit %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Error d'interpretació abans de '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Hi ha hagut un problema carregant el fitxer extret: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Hi ha hagut un problema carregant el fitxer: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "S'esperava una expressió"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Hi ha hagut un problema pujant el fitxer: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Error de sintaxi a la declaració"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagrama de casos d'ús"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "S'esperava }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagrama de classes"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "S'esperava namespace"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagrama de seqüències"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "S'esperava {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagrama de col·laboració"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "S'esperava un nom de namespace"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagrama d'estats"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Necessita un tipus d'especificador a declarar"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagrama d'activitats"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "S'esperava una declaració"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagrama de components"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "S'esperava una expressió constant"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagrama desplegament"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "S'esperava ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagrama entitat relació"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "falta }"
 
-#: 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 "Nom"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "S'esperaven inicialitzadors de membre"
 
-#: 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 "Introduïu nom:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "S'esperava un especificador de classe base"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Aquest no és un nom vàlid per a un diagrama."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "S'esperava una clàusula inicialitzadora"
 
-#: 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 "Nom no vàlid"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "S'esperava un identificador"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Ja hi ha un diagrama usant aquest nom."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "S'esperava un tipus id"
 
-#: 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 "No és un nom únic"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "S'esperava un nom de classe"
 
-#: 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 "Aquest nom no és vàlid."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "S'esperava una condició"
 
-#: 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 "Aquest nom ja s'està usant."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "S'esperava una sentència"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"El nom que heu introduït no era únic.\n"
-"És això el que voleu?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "S'esperava una inicialització for"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nom no únic"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "S'esperava un catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Nom a usar"
+#: 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 "&Propietats"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Introduïu el nou nom"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Activitat inicial"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Esteu segur de voler esborrar el diagrama %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Activitat final"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Esborra diagrama"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Branca/fusiona"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "S'està configurant el document..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Ramifica/uneix"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "S'estan resolent les referències a objectes..."
+#: 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 "General"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "S'estan carregant els elements UML..."
+#: 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 "Propietats generals"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "S'estan carregant els diagrames..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tipus d'activitat:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Diagrama-kde-uml"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nom de l'activitat:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autodesat%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 "Documentació"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Externalitza carpeta"
+#: 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 "Lletra:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Introduïu el nom del model"
+#: 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 "Opcions lletra"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Introduïu el nou nom del model:"
+#: 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 "Color"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vistes"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Colors estris"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"El nom que heu introduït no és vàlid.\n"
-"El procés de creació ha estat cancel·lat."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Activitats"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nom no vàlid"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Activitat nova..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"El nom que heu introduït no és únic!\n"
-"El procés de creació ha estat cancel·lat."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Elimina ancoratge"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Creació cancel·lada"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Reanomena"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "S'està carregant la vista en llista..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Activitat nova"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "La carpeta ha de buidar-se abans d'esborrar-la."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "activitat nova"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Carpeta no buida"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Reanomena activitat"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Ja existeix una operació amb el mateix nom i signatura. No podeu afegir-la de "
-"nou."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Introduïu el nou nom de l'activitat:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Introduïu el nom de l'activitat"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nom:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "estat nou"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipus:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalització"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associacions"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Auto associació"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Propietats de les associacions"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Missatge de col·laboració"
+#: 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 "Opcions generals"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Diagrama de seqüència"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Rols"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Auto missatge de col·laboració"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Opcions dels rols"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Auto missatge de seqüència"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Lletra d'associació"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realització"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Propietats del rol A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Associació uni."
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Propietats del rol B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exporta"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Rol A visibilitat"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagrama"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Rol B visibilitat"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nou"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Rol A canviabilitat"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "M&ostra"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Rol B canviabilitat"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Codi"
+msgid "Rolename:"
+msgstr "Nom de rol:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Llenguatge actiu"
+msgid "Multiplicity:"
+msgstr "Multiplicitat:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentació"
+msgid "Public"
+msgstr "Públic"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Barra-barra (//)"
+msgid "Private"
+msgstr "Privat"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Barra-estrella (/**  */)"
+msgid "Protected"
+msgstr "Protegit"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Estil:"
+msgid "Implementation"
+msgstr "Implementació"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Generació de codi C++</p>"
+msgid "Changeable"
+msgstr "Canviable"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "General"
+msgid "Frozen"
+msgstr "Congelada"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Generació cos del mètode"
+msgid "Add only"
+msgstr "Tan sols afegir"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Usa les següents classes en generar el codi:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nom classe:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nom actor:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nom paquet:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nom de casos d'ús:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nom interfície:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nom component:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "cadena (string)"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nom artefacte:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Cadena</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Nom enum:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Llista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nom tipus de dada:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nom de l'entitat:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Nom e&stereotip:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Nom &paquet:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nom classe"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Classe a&bstracta"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<p align=\"center\">Fitxer include</p>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Classe d'ús a&bstracta"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generació del projecte"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Executable"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Crea un document de construcció ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Dibuixa com a"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Mètodes auto generació"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Per &omissió"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Mètodes constructors buits"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Farciment:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Mètodes accessor d'associació"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Biblioteca"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Mètodes accessor d'atribut"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Taula"
 
-#. 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 "Públic"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibilitat"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Privat"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ública"
 
-#. 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 "Protegit"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivada"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Des de l'objecte pare"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tegida"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Àmbit per omissió del accessor d'atribut:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentació"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Àmbit per omissió del camp d'associació:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nom classe:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Des del rol pare"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nom instància:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generació de codi Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Dibuixa com a actor"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hash (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Instància múltiple"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Inici-Fi (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Mostra destrucció"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generació de codi Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nom component:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nom node:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nom estereotip:"
+
+#: 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 ""
+"El nom que heu escollit\n"
+"ja s'està usant.\n"
+"El nom serà reinicialitzat."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "El nom no és únic"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributs"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Atribut n&ou..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacions"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "No&va operació..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Plantilles"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Plantilla no&va..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum literals"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ou enum literal..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributs d'entitat"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Atribut d'&entitat nou..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Elimina ancoratge"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Propietats"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Mostra"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operacio&ns"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibilitat"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&peració de signatura"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&quet"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributs"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Estereot&ip"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Atr&ibuts de signatura"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Dibuixa com un cercle"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Mostra"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opcions per a mostrar"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Opcions de l'atribut"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Opcions operació"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Opcions plantilles"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Opcions enum literals"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Opcions dels atributs d'entitat"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Contenció"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Opcions continguts"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Associacions de classe"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_classe"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nova Classe"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributs de classe"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operacions de classe"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Opcions generació de codi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Llenguatge"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Genera"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Carpetes"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Finalitzat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Escriu tots els fitxers generats a una carpeta:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Codi generat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "E&xplora..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "No generat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Ex&plora..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Encara no s'ha generat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Inclou els fitxer de capçalera des de la carpeta:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "La carpeta %1 no existeix. La voleu crear ara?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Els fitxers generats pel generador de codi s'han d'escriure en aquesta carpeta"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "LA carpeta de sortida no existeix"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Crea carpeta"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "No crear la carpeta"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Els fitxers en aquesta carpeta seran usats com a fitxers de capçalera en el "
-"codi generat"
+"La carpeta no s'ha pogut crear.\n"
+"Assegureu-vos de tenir permisos d'escriptura per a la carpeta pare o "
+"seleccioneu una carpeta vàlida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Política de sobreescriptura"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Error creant la carpeta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Si us plau, seleccioneu una carpeta vàlida."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Si ja existeix un fitxer amb el mateix nom que al que el\n"
-"generador de codi desitja usar com a fitxer de sortida:"
+"La carpeta de sortida ja existeix, però no s'hi pot escriure.\n"
+"Si us plau, establiu-hi els permisos apropiats o escolliu-ne una altra."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "S&obreescriure"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Error escrivint a la carpeta de sortida"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr ""
-"Sobreescriu els fitxers existents si que ja estan a la carpeta de destí"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 no sembla ser una carpeta. Escolliu-ne una de vàlida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Pregunta"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Si us plau, escolliu una carpeta vàlida"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Si un fitxer condeix en el nom amb un d'existent, pregunta què fer"
+msgid "Code Viewer"
+msgstr "Visor de codi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Usa un nom diferent"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">No hi ha opcions disponibles.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Si un fitxer ja existeix a la carpeta de destí, seleccionar un nom diferent a "
-"usar per afegir un sufix al nom de fitxer"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrames"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Format"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtre"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Línies"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Diagrama a&ctual"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Estil fi de línia:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "T&ots els diagrames"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Tipus de sagnat:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "Diagrames &seleccionats"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Quantitat de sagnat:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tipus de diagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selecció"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Casos d'ús"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Col·laboració"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Sense sagnat"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Seqüència"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulació"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Estat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Espai"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Component"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Detall en els comentaris"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Desplegament"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Diagrama-kde-uml"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "No hi ha diagrames seleccionats."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "El format al que exportar les imatges"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Nota de documentació"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "El fitxer de destí ja existeix"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Escriure comentaris &per a les seccions encara\n"
-"que la secció estigui buida"
+"El fitxer %1 ja existeix en %2.\n"
+"\n"
+"Umbrello el pot sobreescriure, generar un nom\n"
+"de fitxer similar o no no generar aquest fitxer."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Aplica a tots els fitxers restants"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "S&obreescriure"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Genera fitxer de nom similar"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&No generar el fitxer"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Propietats del paràmetre"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipus:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nom:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Valor &inicial:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Direcció de passa"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Escriure comentaris per a indicar les diferents seccions (pública, privada, "
-"etc.) en una classe, fins i tot si les seccions estan buides"
+"\"in\" és un paràmetre que només es pot llegir, \"out\" és un paràmetre que "
+"només es pot escriure i \"inout\" és un paràmetre que es pot llegir i "
+"escriure."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr ""
-"&Escriure comentaris de documentació encara que\n"
-"estiguin buits"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Ítems continguts"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Escriure comentaris de documentació &de classes i mètode encara que estiguin "
-"buits"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Selecciona operació"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Opcions llenguatge"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Número de seqüència:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Assistent generador de codi"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operació de classe:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Selecció de classes"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Operació personalitzada:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Configura Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interfície d'usuari"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Opcions interfície d'usuari"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Color de línia:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Color per &omissió"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Color de farciment:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Color per o&missió"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Ample de línia:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "A&mplada per omissió"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Usa color de farciment"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Situeu a la llista de la dreta totes les classes que\n"
-"desitgeu usar per a generar el codi"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Afegeix classe per a generar el codi"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Habilita el desfer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Classes seleccionades"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Usa diagrames en pestanya"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Elimina classe de la generació de codi"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Usa els nous generadors de C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Classes disponibles"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Usa línies d'associació angulars"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Estatus de la generació de codi"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Auto desat"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Prémer el botó Genera per a iniciar la generació de codi"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Habilita l'auto desat"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Estatus de la generació"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Selecciona l'interval de temps de l'auto desat (minuts):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Visor de codi"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Estableix el sufix d'auto desat:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Mostra blocs ocults"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>El fitxer serà desat automàticament a ~/autosave.xmi si ocorre abans "
+"que el deseu manualment.</p><p>Si ja l'havíeu desat anteriorment, es desarà "
+"automàticament en la mateixa carpeta en la que es troba el fitxer i amb el "
+"mateix nom seguit pel sufix especificat.</p><p>Si el sufix és igual al del "
+"fitxer desat, en desar automàticament se sobreescriurà el fitxer existent.</"
+"p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">nom del component aquí</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Inici"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Mostra tipus de bloc"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logo i&nici"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Colors"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Consell del dia"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Lletra:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Ca&rrega l'últim projecte"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Paper:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Comença projecte nou amb:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Seleccionat:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Cap diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Bloc objecte UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagrama de classes"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Bloc ocult:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagrama de casos d'ús"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Text no editable:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagrama de seqüències"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Text editable:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagrama de col·laboració"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Propietats del diagrama"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagrama d'estats"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nom:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagrama d'activitats"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Apropa:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagrama de components"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagrama de desplegament"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Opcions classes"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Mostra &visibilitat"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Mostra atributs"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Mostra operacions"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Mostra estereot&ips"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Mostra atribut signatura"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Mostra paquet"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Mostra operació signatura"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Mostra &graella"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Àmbit inicial"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Ajusta &a la graella"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Àmbit per omissió dels atributs:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Ajusta a la mida dels components"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Àmbit per omissió de les operacions:"
 
-#. 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."
-msgstr ""
-"Ajusta la mida dels components per a ser un múltiple de l'espaiat de la "
-"graella.\n"
-"Si \"Ajusta a la graella\" està habilitat un component permetrà que s'alinei a "
-"la graella pels 4 costats."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generació de codi"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Espaiat de la graella:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Opcions generació de codi"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Opcions visor de codi"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Estat inicial"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Amplada de la línia:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Estat final"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exporta totes les vistes"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tipus d'estat:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Directori per a desar els diagrames en:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nom de l'estat:"
 
-#. 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"
-msgstr "El directori base usat per a desar les imatges"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Color estri"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Tipus d'&imatge:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Propietats de l'atribut"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "El format al que exportar les imatges"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "&Àmbit classificador (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Usa &carpetes"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Pública"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Crea en la carpeta de destí la mateixa estructura en arbre\n"
-"usada en el documento per a desar les vistes"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&egida"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementació"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Heu introduït un nom d'atribut no vàlid."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nom d'atribut no vàlid"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Les vistes són desades en carpetes en el document. Amb aquesta opció es pot "
-"crear en el directori base seleccionat la mateixa estructura en arbre usada en "
-"el document per a desar les vistes.\n"
-"Tan sols les carpetes creades per l'usuari seran creades en el directori base "
-"(la vista lògica, la vista en cas d'ús i demés no seran creades)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "El nom d'atribut que heu escollit ja s'està usant en aquesta operació."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Propietats del rol"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Nom d'atribut no únic"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Nom de rol:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Propietats de l'atribut d'entitat"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicitat:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Valor per &defecte:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Rol canviabilitat"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Longitud/valors:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Tan sols afegir"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto increment"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Congelada"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Permet &nul"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Canviable"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributs:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Rol visibilitat"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexat"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementació"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "C&ap"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Benvingut a Umbrello.</p>\n"
-"<p>Els diagrames UML us permeten dissenyar i documentar programes orientats a "
-"objectes.  <a href=\"help:/umbrello\">El manual de Umbrello</a> "
-"és una bona introducció a l'ús de UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primari"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Benvingut a Umbrello 1.5.  Aquesta versió te com a novetat les classes "
-"d'associació, la generació de codi Ruby, les carpetes externalitzables, la "
-"capacitat de convertir interfícies en classes, i molt més.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Ín&dex"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Els diagrames en pestanya i les carpetes externalitzades són mútuament "
-"excloents. Si necessiteu carpetes externes llavors no heu de desseleccionar "
-"&quot;Usa diagrames en pestanya&quot; en les preferències generals.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Únic"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>La majoria d'ítems del diagrama no es poden amidar, atès que ho fan ells "
-"mateixos per ajustar-se al seu contingut.\n"
-"Caixes, notes i missatges de diagrama de seqüències poden ser amidats amb tan "
-"sols clicar i arrossegar sobre el quadrat vermell.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Heu introduït un nom d'atribut d'entitat no vàlid."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Si voleu afegir una classe existent a un diagrama, tan sols heu d'arrossegar "
-"la seva entrada des de la vista en arbre</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nom d'atribut d'entitat no vàlid"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p> Els agents de refactorització de Umbrello us permeten moure operacions "
-"entre una classe i els seus derivats i les seves classes base.\n"
-"Clic dret en una classe per a obrir l'agent de refactorització.</p>\n"
+"El nom de l'atribut d'entitat que heu escollit ja s'està usant en aquesta "
+"operació."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Els objectes en el diagrama de seqüències poden tenir una caixa de "
-"destrucció i ser mostrats com a actors.\n"
-"Fent doble clic en el diàleg Propietats.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Nom de l'atribut d'entitat no únic"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Els missatges de diagrama de seqüència poden actuar com a constructors.  Feu "
-"clic a la caixa de l'objecte (més bé sobre la línia vertical) per a tornar-lo "
-"un constructor.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Propietats de l'operació"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Els diagrames de seqüència accepten missatges a si mateix.  Feu clic una "
-"altra vegada en la mateixa línia vertical per a crear un auto missatge.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Operació &abstracta"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Si carregant un fitxer extern no es mostra res en la vista en llista, proveu "
-"a desar el model sota un nom diferent,\n"
-"tanqueu-lo, i torneu a carregar el fitxer desat.  Normalment la vista en llista "
-"serà mostrada correctament.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Petició (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Talla i enganxa pot exportar la imatge cap al portapapers en format PNG\n"
-"per a posteriorment enganxar-la al KWord o d'altres aplicacions.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Paràmetres"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Les associacions no tenen perquè estar en línies rectes, fent doble clic a "
-"sobre d'una crearem un punt movible.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Paràmetre no&u..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Podeu activar l'auto desat en el diàleg de configuració d'Umbrello.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Heu introduït un nom de paràmetre no vàlid."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Trobeu a faltar cap característica en Umbrello? Si us plau, feu-nos-ho "
-"saber.\n"
-"Afegiu-la a la base de dades d'errors reportats mitjançant un informe d'error "
-"des del mateix menú Ajuda de l'aplicació o envieu-nos-la a la llista de correu "
-"uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-"</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nom de paràmetre no vàlid"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Podeu esborrar tots els objectes seleccionats prement les tecles Supr o "
-"Retrocés.</p>\n"
+"El nom de paràmetre que heu escollit\n"
+"ja s'està usant en aquesta operació."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Si trobeu un error (bug) a Umbrello, si us plau, feu-nos-ho saber.\n"
-"Ens podeu informar dels errors mitjançant l'eina d'informe d'errors\n"
-"que hi ha en el menú Ajuda.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Nom de paràmetre no únic"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Prement la tecla Esc s'estableix a l'eina actual a l'eina seleccionada.\n"
-"La de Retrocés salta a l'eina emprada anteriorment.</p>\n"
+"El nom de paràmetre que heu escollit ja s'està usant en aquesta operació."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Heu introduït un nom d'operació no vàlid."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nom d'operació no vàlid"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Ja existeix una operació amb aquesta signatura en %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Trieu un nom o llista de paràmetres diferent."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Propietats del rol"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Propietats de la plantilla"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Heu introduït un nom de plantilla no vàlid."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nom de plantilla no vàlid"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Podeu seleccionar tots els objectes prement Ctrl-A.</p>\n"
+"El nom de paràmetre de la plantilla que heu escollit ja s'està usant en "
+"aquesta operació."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Nom de plantilla no únic"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opcions per a mostrar classes"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Colors diagrama"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "El nom que heu introduït no és vàlid."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "El nom que heu introduït no és únic."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nom no únic"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Línia:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Farciment:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Per o&missió"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Usa farciment"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Exporta totes les vistes..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "S'han generat alguns errors en exportar les imatges:"
+
+#: 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 "Hi ha hagut un problema desant el fitxer: %1"
 
-#: tips.txt:108
+#: 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 "Error mentre es desava"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Generador de codi autònom del modelador UML Umbrello"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Fitxer a transformar"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "El fitxer XSLT a usar"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Podeu crear i configurar una nova classe usant l'Assistent de nova classe en "
-"el menú Codi.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Autors del modelador "
+"UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autors del modelador UML Umbrello"
+
+#: 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 "Nom"
+
+#: 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 "Introduïu nom:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Introduïu el nom de l'operació:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Introduïu el nou text:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERROR"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Canvia text"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "El fitxer de carpeta %1 no existeix."
+
+#: 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 "Error de càrrega"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "El fitxer de carpeta %1 no sembla estar obert."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1704,6 +1825,10 @@ msgstr "Operació nova..."
 msgid "Select Operation..."
 msgstr "Selecciona operació..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Canvia text..."
@@ -1755,6 +1880,19 @@ msgstr "Nou"
 msgid "Rename..."
 msgstr "Reanomena..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Error en enganxar"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Color de línia..."
@@ -1783,14 +1921,26 @@ msgstr "Internalitza carpeta"
 msgid "Import Classes..."
 msgstr "Importa classes..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paquet"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Subsistema"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefacte"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagrama de components..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Node"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagrama de desplegament..."
@@ -1799,10 +1949,18 @@ msgstr "Diagrama de desplegament..."
 msgid "Folder"
 msgstr "Carpeta"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entitat"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagrama d'entitat relació..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Actor"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagrama de casos d'ús..."
@@ -1839,6 +1997,18 @@ msgstr "Atribut d'entitat nou..."
 msgid "Export as Picture..."
 msgstr "Exporta com a imatge..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfície"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tipus de dada"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enum"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagrama de classes..."
@@ -1859,26 +2029,10 @@ msgstr "Diagrama de seqüències..."
 msgid "Collaboration Diagram..."
 msgstr "Diagrama de col·laboració..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributs"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacions"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Només públic"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibilitat"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operació signatura"
@@ -1891,11 +2045,6 @@ msgstr "Atribut signatura"
 msgid "Stereotype"
 msgstr "Estereotip"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Mostra"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribut..."
@@ -1920,14 +2069,6 @@ msgstr "Color de farciment..."
 msgid "Use Fill Color"
 msgstr "Usa color de farciment"
 
-#: 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 "Color"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Actor..."
@@ -1956,10 +2097,26 @@ msgstr "Enum..."
 msgid "Package..."
 msgstr "Paquet..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Estat inicial"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Estat final"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Estat..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Activitat inicial"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Activitat final"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Subsistema..."
@@ -2004,6 +2161,14 @@ msgstr "Elimina ancoratge"
 msgid "Change Association Name..."
 msgstr "Canvia nom de l'associació..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Neteja diagrama"
@@ -2038,200 +2203,107 @@ msgstr "El directori del fitxer"
 
 #: 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 ""
-"Manté l'estructura en arbre usada per a desar les vistes en el document en el "
-"directori de destí"
+"Manté l'estructura en arbre usada per a desar les vistes en el document en "
+"el directori de destí"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006, Autors del modelador UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Ús incorrecte de les associacions."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Error d'associació"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "El fitxer de carpeta %1 no existeix."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "El fitxer de carpeta %1 no sembla estar obert."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Antoni Bella Pérez,Albert Astals Cid"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "bella5@teleline.es,astals11@terra.es"
-
-#: 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 "Llest."
-
-#: 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 ""
-"Premeu Majúscules o Control per a moure en l'eix X. Premeu ambdues tecles per a "
-"moure en l'eix Y. Feu clic amb el botó dret per a cancel·lar l'acció de moure."
-
-#: 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 ""
-"Premeu Majúscules o Control per a moure en l'eix X. Premeu ambdues tecles per a "
-"moure en l'eix Y. Feu clic amb el botó dret per a cancel·lar l'acció d'amidar."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "És l'àmbit %1 un espai de noms o una classe?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "La importació de C++ requereix la vostra ajuda"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Espai de nom"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "S'està important el fitxer: %1 Progrés %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Error intern"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Error de sintaxi abans de '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Error d'interpretació abans de '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nou_actor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "S'esperava una expressió"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nou_encasdús"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Error de sintaxi a la declaració"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nou_paquet"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "S'esperava }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nou_component"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "S'esperava namespace"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nou_node"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "S'esperava {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nou_artefacte"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "S'esperava un nom de namespace"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nova_interfície"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Necessita un tipus d'especificador a declarar"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nou_tipusdada"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "S'esperava una declaració"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nou_enum"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "S'esperava una expressió constant"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nova_entitat"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "S'esperava ')'"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nova_carpeta"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "falta }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nova_associació"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "S'esperaven inicialitzadors de membre"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nou_objecte"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "S'esperava un especificador de classe base"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "S'esperava una clàusula inicialitzadora"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Buit"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "S'esperava un identificador"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argument malformat"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "S'esperava un tipus id"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tipus d'argument desconegut"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "S'esperava un nom de classe"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nom de mètode il·legal"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "S'esperava una condició"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tipus de retorn desconegut"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "S'esperava una sentència"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Error sense especificar"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "S'esperava una inicialització for"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Aquesta és una paraula reservada pel llenguatge configurat com a generador "
+"de codi."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "S'esperava un catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Paraula reservada"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2245,107 +2317,66 @@ msgstr "Introduïu nom de l'objecte:"
 msgid "new_parameter"
 msgstr "nou_paràmetre"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Opcions generals"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paquet és un espai de nom"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Destructors virtuals"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Genera constructors buits"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Genera mètodes accessor"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operacions són incloses"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Accessors són inclosos"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Accessors són públics"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagrama: %2 Pàgina %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Introduïu el nom del diagrama"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Afegeix classe base"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Introduïu el nou nom del diagrama:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Afegeix classe derivada"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Aneu a esborrar el diagrama sencer.\n"
-"N'esteu segur?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Afegeix operació"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Esborrar el diagrama?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Afegeix atribut"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "El reanomenat s'ha cancel·lat"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Afegeix interfície base"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Encara no s'ha implementat el reanomenar un ítem de la vista en llista de tipus "
-"%1."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Afegeix interfície derivada"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funció no implementada"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Classificadors base"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"El nom que heu introduït no és vàlid.\n"
-"El procés de reanomenat ha estat cancel·lat."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Classificadors derivats"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nova_associació"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Introduïu el nom de l'estat"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nou_atribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Introduïu el nom del nou estat:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nova_plantilla"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Introduïu activitat"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operació"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Ús incorrecte de les associacions."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nou_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Error d'associació"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nou_camp"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "estat nou"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2499,11 +2530,6 @@ msgstr "&Exporta com a imatge..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Exporta &tots els diagrames com a imatges..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Propietats"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Deslliçador d'&ampliació"
@@ -2588,21 +2614,28 @@ msgstr "&Documentació"
 msgid "Opening file..."
 msgstr "S'està obrint el fitxer..."
 
+#: 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 "S'està creant un nou document..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Tots els fitxers acceptats (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl|)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Tots els fitxers acceptats (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl|)\n"
 "*.xmi|Fitxers XMI sense comprimir (*.xmi)\n"
 "*.xmi.tgz|Fitxers XMI comprimits amb Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Fitxers XMI comprimits amb Bzip2 (*.xmi.tar.bz2)\n"
@@ -2632,6 +2665,10 @@ msgstr ""
 "*.xmi.tar.bz2|Fitxer XMI comprimit amb Bzip2\n"
 "*|Tots els fitxers"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2640,6 +2677,10 @@ msgstr ""
 "El fitxer %1 ja existeix.\n"
 "El voleu sobreescriure?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Sobreescriure"
@@ -2675,8 +2716,8 @@ msgstr "S'està inserint el contingut del portapapers..."
 
 #: 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 ""
 "Umbrello no ha pogut enganxar el contingut del portapapers. Els objectes del "
 "portapapers deuen ser d'un tipus incorrecte a enganxar aquí."
@@ -2734,1264 +2775,1323 @@ msgstr "Tots els fitxers"
 msgid "Select Code to Import"
 msgstr "Selecciona el codi a importar"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nom classe:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nom actor:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nou_atribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nom paquet:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nova_plantilla"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nom de casos d'ús:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operació"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nom interfície:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nou_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nom component:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nou_camp"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nom artefacte:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Model UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Nom enum:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Vista lògica"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nom tipus de dada:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Vista casos d'ús"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nom de l'entitat:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Vista component"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Nom e&stereotip:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Vista desplegament"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Nom &paquet:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model entitat relació"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Classe a&bstracta"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipus de dades"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Classe d'ús a&bstracta"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"El fitxer actual ha estat modificat.\n"
+"Desitgeu desar-lo?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Executable"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "El fitxer %1 no existeix."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Dibuixa com a"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "El fitxer %1 sembla estar corrupte."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Per &omissió"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "No s'ha trobat un fitxer XMI dins del fitxer comprimit %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Biblioteca"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Hi ha hagut un problema carregant el fitxer extret: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Taula"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Hi ha hagut un problema carregant el fitxer: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ública"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Hi ha hagut un problema pujant el fitxer: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivada"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagrama de casos d'ús"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tegida"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagrama de classes"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentació"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagrama de seqüències"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nom classe:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagrama de col·laboració"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nom instància:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagrama d'estats"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Dibuixa com a actor"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagrama d'activitats"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Instància múltiple"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagrama de components"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Mostra destrucció"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagrama desplegament"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nom component:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagrama entitat relació"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nom node:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Aquest no és un nom vàlid per a un diagrama."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nom estereotip:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Ja hi ha un diagrama usant aquest nom."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"El nom que heu escollit\n"
-"ja s'està usant.\n"
-"El nom serà reinicialitzat."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "El nom no és únic"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Línia:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Farciment:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Per o&missió"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Usa farciment"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Activitats"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Activitat nova..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Reanomena"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Activitat nova"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Reanomena activitat"
+"El nom que heu introduït no era únic.\n"
+"És això el que voleu?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Introduïu el nou nom de l'activitat:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Nom a usar"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Propietats de les associacions"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Introduïu el nou nom"
 
-#: 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 "Opcions generals"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Esteu segur de voler esborrar el diagrama %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Rols"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Esborra diagrama"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Opcions dels rols"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "S'està configurant el document..."
 
-#: 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 "Opcions lletra"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "S'estan resolent les referències a objectes..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Lletra d'associació"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "S'estan carregant els elements UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Propietats de la plantilla"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "S'estan carregant els diagrames..."
 
-#: 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 "Propietats generals"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autodesat%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipus:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externalitza carpeta"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nom:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Introduïu el nom del model"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Heu introduït un nom de plantilla no vàlid."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Introduïu el nou nom del model:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nom de plantilla no vàlid"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vistes"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"El nom de paràmetre de la plantilla que heu escollit ja s'està usant en aquesta "
-"operació."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Nom de plantilla no únic"
+"El nom que heu introduït no és vàlid.\n"
+"El procés de creació ha estat cancel·lat."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Propietats de l'atribut d'entitat"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nom no vàlid"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Valor per &defecte:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"El nom que heu introduït no és únic!\n"
+"El procés de creació ha estat cancel·lat."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Longitud/valors:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Creació cancel·lada"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto increment"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "S'està carregant la vista en llista..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Permet &nul"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "La carpeta ha de buidar-se abans d'esborrar-la."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributs:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Carpeta no buida"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexat"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "El reanomenat s'ha cancel·lat"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "C&ap"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Encara no s'ha implementat el reanomenar un ítem de la vista en llista de "
+"tipus %1."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primari"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funció no implementada"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Ín&dex"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"El nom que heu introduït no és vàlid.\n"
+"El procés de reanomenat ha estat cancel·lat."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Únic"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagrama: %2 Pàgina %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Heu introduït un nom d'atribut d'entitat no vàlid."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Introduïu el nom del diagrama"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nom d'atribut d'entitat no vàlid"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Introduïu el nou nom del diagrama:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"El nom de l'atribut d'entitat que heu escollit ja s'està usant en aquesta "
-"operació."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Nom de l'atribut d'entitat no únic"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Mostra"
+"Aneu a esborrar el diagrama sencer.\n"
+"N'esteu segur?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opcions per a mostrar classes"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Esborrar el diagrama?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Colors diagrama"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "S'està exportant la vista..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "El nom que heu introduït no és vàlid."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Ha succeït un error mentre s'exportava la imatge:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "El nom que heu introduït no és únic."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"El fitxer seleccionat %1 ja existeix.\n"
+"Desitgeu sobreescriure'l?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipus:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "El fitxer ja existeix"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Configura Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "No es pot crear el directori: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interfície d'usuari"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "No es pot desar un diagrama buit"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Opcions interfície d'usuari"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Ha succeït un problema mentre es desava el diagrama en %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Color de línia:"
+#: 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 ""
+"Premeu Majúscules o Control per a moure en l'eix X. Premeu ambdues tecles "
+"per a moure en l'eix Y. Feu clic amb el botó dret per a cancel·lar l'acció "
+"de moure."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Color per &omissió"
+#: 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 ""
+"Premeu Majúscules o Control per a moure en l'eix X. Premeu ambdues tecles "
+"per a moure en l'eix Y. Feu clic amb el botó dret per a cancel·lar l'acció "
+"d'amidar."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Color de farciment:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objecte"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Color per o&missió"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Missatge síncron"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Ample de línia:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Missatge asíncron"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "A&mplada per omissió"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etiqueta"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Usa color de farciment"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Nota"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Habilita el desfer"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Caixa"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Usa diagrames en pestanya"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relació"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Usa els nous generadors de C++/Java/Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Associació direccional"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Usa línies d'associació angulars"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementació (generalització/especialització)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Auto desat"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Historia profunda"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Habilita l'auto desat"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Historia superficial"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Selecciona l'interval de temps de l'auto desat (minuts):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Join"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Estableix el sufix d'auto desat:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Bifurcació"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>El fitxer serà desat automàticament a ~/autosave.xmi si ocorre abans que el "
-"deseu manualment.</p>"
-"<p>Si ja l'havíeu desat anteriorment, es desarà automàticament en la mateixa "
-"carpeta en la que es troba el fitxer i amb el mateix nom seguit pel sufix "
-"especificat.</p>"
-"<p>Si el sufix és igual al del fitxer desat, en desar automàticament se "
-"sobreescriurà el fitxer existent.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Unió"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Inici"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Elecció"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logo i&nici"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Activitat de transició"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Consell del dia"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Missatge"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Ca&rrega l'últim projecte"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "SENSE DEFINIR"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Comença projecte nou amb:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Selecció"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Cap diagrama"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagrama de classes"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagrama de casos d'ús"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagrama de seqüències"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagrama de col·laboració"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Mostra operacions"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagrama d'estats"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagrama d'activitats"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Neteja diagrama"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagrama de components"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagrama de desplegament"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalització"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Opcions classes"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Mostra &visibilitat"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Mostra atributs"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nom de l'associació"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Mostra operacions"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Mostra estereot&ips"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Mostra atribut signatura"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Mostra paquet"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Per &omissió"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Àmbit inicial"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Àmbit per omissió dels atributs:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Barra-barra (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Àmbit per omissió de les operacions:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Barra-estrella (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generació de codi"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Estil:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Opcions generació de codi"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Generació de codi C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Opcions visor de codi"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Generació cos del mètode"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Propietats de l'operació"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Usa les següents classes en generar el codi:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Operació &abstracta"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "&Àmbit classificador (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Petició (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variable</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&egida"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementació"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Paràmetres"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "cadena (string)"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Paràmetre no&u..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Cadena</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Heu introduït un nom de paràmetre no vàlid."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Llista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nom de paràmetre no vàlid"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"El nom de paràmetre que heu escollit\n"
-"ja s'està usant en aquesta operació."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Nom de paràmetre no únic"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"El nom de paràmetre que heu escollit ja s'està usant en aquesta operació."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nom classe"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Heu introduït un nom d'operació no vàlid."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<p align=\"center\">Fitxer include</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nom d'operació no vàlid"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generació del projecte"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Ja existeix una operació amb aquesta signatura en %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Crea un document de construcció ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Trieu un nom o llista de paràmetres diferent."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Mètodes auto generació"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Propietats del rol A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Mètodes constructors buits"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Propietats del rol B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Mètodes accessor d'associació"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Rol A visibilitat"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Mètodes accessor d'atribut"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Rol B visibilitat"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Des de l'objecte pare"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Rol A canviabilitat"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Àmbit per omissió del accessor d'atribut:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Rol B canviabilitat"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Àmbit per omissió del camp d'associació:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Ítems continguts"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Des del rol pare"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Nota de documentació"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generació de codi Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Atribut n&ou..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hash (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "No&va operació..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Inici-Fi (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Plantilles"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generació de codi Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Plantilla no&va..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Llenguatge"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum literals"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Carpetes"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ou enum literal..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Escriu tots els fitxers generats a una carpeta:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributs d'entitat"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "E&xplora..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Atribut d'&entitat nou..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Ex&plora..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Activitat inicial"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Inclou els fitxer de capçalera des de la carpeta:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Activitat final"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Els fitxers generats pel generador de codi s'han d'escriure en aquesta "
+"carpeta"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tipus d'activitat:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Els fitxers en aquesta carpeta seran usats com a fitxers de capçalera en el "
+"codi generat"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nom de l'activitat:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Política de sobreescriptura"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Colors estris"
+#: 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 ""
+"Si ja existeix un fitxer amb el mateix nom que al que el\n"
+"generador de codi desitja usar com a fitxer de sortida:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Propietats de l'atribut"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "S&obreescriure"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Valor &inicial:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
+"Sobreescriu els fitxers existents si que ja estan a la carpeta de destí"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Pública"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Pregunta"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Heu introduït un nom d'atribut no vàlid."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Si un fitxer condeix en el nom amb un d'existent, pregunta què fer"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nom d'atribut no vàlid"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Usa un nom diferent"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "El nom d'atribut que heu escollit ja s'està usant en aquesta operació."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Si un fitxer ja existeix a la carpeta de destí, seleccionar un nom diferent "
+"a usar per afegir un sufix al nom de fitxer"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Nom d'atribut no únic"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Format"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Selecciona operació"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Línies"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Número de seqüència:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Estil fi de línia:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operació de classe:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Tipus de sagnat:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Operació personalitzada:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Quantitat de sagnat:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrames"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtre"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Diagrama a&ctual"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "T&ots els diagrames"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Sense sagnat"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "Diagrames &seleccionats"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulació"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tipus de diagrama"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Espai"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selecció"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Detall en els comentaris"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Col·laboració"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Escriure comentaris &per a les seccions encara\n"
+"que la secció estigui buida"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Seqüència"
+#: 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 ""
+"Escriure comentaris per a indicar les diferents seccions (pública, privada, "
+"etc.) en una classe, fins i tot si les seccions estan buides"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Desplegament"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr ""
+"&Escriure comentaris de documentació encara que\n"
+"estiguin buits"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "No hi ha diagrames seleccionats."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Escriure comentaris de documentació &de classes i mètode encara que estiguin "
+"buits"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opcions per a mostrar"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Opcions llenguatge"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Opcions de l'atribut"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Assistent generador de codi"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Opcions operació"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Selecció de classes"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Opcions plantilles"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Situeu a la llista de la dreta totes les classes que\n"
+"desitgeu usar per a generar el codi"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Opcions enum literals"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Afegeix classe per a generar el codi"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Opcions dels atributs d'entitat"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Classes seleccionades"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Opcions continguts"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Elimina classe de la generació de codi"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associacions"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Classes disponibles"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Associacions de classe"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Estatus de la generació de codi"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operacio&ns"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Prémer el botó Genera per a iniciar la generació de codi"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibilitat"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Estatus de la generació"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&peració de signatura"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Mostra blocs ocults"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&quet"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">nom del component aquí</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributs"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Estereot&ip"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Mostra tipus de bloc"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Atr&ibuts de signatura"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Colors"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Dibuixa com un cercle"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Lletra:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Estat inicial"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Paper:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Estat final"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Seleccionat:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tipus d'estat:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Bloc objecte UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nom de l'estat:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Bloc ocult:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Color estri"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Text no editable:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_classe"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Text editable:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nova Classe"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Propietats del diagrama"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributs de classe"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Apropa:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operacions de classe"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Propietats del paràmetre"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Mostra &graella"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Direcció de passa"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Ajusta &a la graella"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Ajusta a la mida dels components"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" és un paràmetre que només es pot llegir, \"out\" és un paràmetre que "
-"només es pot escriure i \"inout\" és un paràmetre que es pot llegir i escriure."
+"Ajusta la mida dels components per a ser un múltiple de l'espaiat de la "
+"graella.\n"
+"Si \"Ajusta a la graella\" està habilitat un component permetrà que s'alinei "
+"a la graella pels 4 costats."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Genera"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Espaiat de la graella:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Finalitzat"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Codi generat"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "No generat"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Amplada de la línia:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Encara no s'ha generat"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exporta totes les vistes"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "La carpeta %1 no existeix. La voleu crear ara?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Directori per a desar els diagrames en:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "LA carpeta de sortida no existeix"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "El directori base usat per a desar les imatges"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Crea carpeta"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Tipus d'&imatge:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "No crear la carpeta"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Usa &carpetes"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"La carpeta no s'ha pogut crear.\n"
-"Assegureu-vos de tenir permisos d'escriptura per a la carpeta pare o "
-"seleccioneu una carpeta vàlida."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Error creant la carpeta"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Si us plau, seleccioneu una carpeta vàlida."
+"Crea en la carpeta de destí la mateixa estructura en arbre\n"
+"usada en el documento per a desar les vistes"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"La carpeta de sortida ja existeix, però no s'hi pot escriure.\n"
-"Si us plau, establiu-hi els permisos apropiats o escolliu-ne una altra."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Error escrivint a la carpeta de sortida"
+"Les vistes són desades en carpetes en el document. Amb aquesta opció es pot "
+"crear en el directori base seleccionat la mateixa estructura en arbre usada "
+"en el document per a desar les vistes.\n"
+"Tan sols les carpetes creades per l'usuari seran creades en el directori "
+"base (la vista lògica, la vista en cas d'ús i demés no seran creades)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 no sembla ser una carpeta. Escolliu-ne una de vàlida."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Rol canviabilitat"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Si us plau, escolliu una carpeta vàlida"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Rol visibilitat"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "El fitxer de destí ja existeix"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exporta"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"El fitxer %1 ja existeix en %2.\n"
-"\n"
-"Umbrello el pot sobreescriure, generar un nom\n"
-"de fitxer similar o no no generar aquest fitxer."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Aplica a tots els fitxers restants"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "S&obreescriure"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Genera fitxer de nom similar"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&No generar el fitxer"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">No hi ha opcions disponibles.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicitat"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Introduïu multiplicitat:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nom de l'associació"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Introduïu el nom de l'associació:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nom de rol"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Introduïu nom de rol:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Introduïu el nom de l'operació:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Introduïu el nou text:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERROR"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Canvia text"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Alinea a l'esquerra"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Alinea a la dreta"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagrama"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Alinea a dalt"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nou"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alinea a baix"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "M&ostra"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Alinea al mig verticalment"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Apropa:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Alinea al mig horitzontalment"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Codi"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Distribució alineada verticalment"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Llenguatge actiu"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Distribució alineada horitzontalment"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Per a l'alineació almenys haureu de tenir escollits 2 objectes com a classes o "
-"actors. No podeu alinear associacions."
+"<p>Benvingut a Umbrello.</p>\n"
+"<p>Els diagrames UML us permeten dissenyar i documentar programes orientats "
+"a objectes.  <a href=\"help:/umbrello\">El manual de Umbrello</a> és una "
+"bona introducció a l'ús de UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Aquesta és una paraula reservada pel llenguatge configurat com a generador de "
-"codi."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Paraula reservada"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "S'està exportant la vista..."
+"<p>Benvingut a Umbrello 1.5.  Aquesta versió te com a novetat les classes "
+"d'associació, la generació de codi Ruby, les carpetes externalitzables, la "
+"capacitat de convertir interfícies en classes, i molt més.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Ha succeït un error mentre s'exportava la imatge:\n"
+"<p>Els diagrames en pestanya i les carpetes externalitzades són mútuament "
+"excloents. Si necessiteu carpetes externes llavors no heu de desseleccionar "
+"&quot;Usa diagrames en pestanya&quot; en les preferències generals.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"El fitxer seleccionat %1 ja existeix.\n"
-"Desitgeu sobreescriure'l?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "El fitxer ja existeix"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nou_actor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nou_encasdús"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nou_paquet"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nou_component"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nou_node"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nou_artefacte"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nova_interfície"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nou_tipusdada"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nou_enum"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nova_entitat"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nova_carpeta"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nou_objecte"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Buit"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argument malformat"
+"<p>La majoria d'ítems del diagrama no es poden amidar, atès que ho fan ells "
+"mateixos per ajustar-se al seu contingut.\n"
+"Caixes, notes i missatges de diagrama de seqüències poden ser amidats amb "
+"tan sols clicar i arrossegar sobre el quadrat vermell.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tipus d'argument desconegut"
+#: 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 ""
+"<p>Si voleu afegir una classe existent a un diagrama, tan sols heu "
+"d'arrossegar la seva entrada des de la vista en arbre</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nom de mètode il·legal"
+#: 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 ""
+"<p> Els agents de refactorització de Umbrello us permeten moure operacions "
+"entre una classe i els seus derivats i les seves classes base.\n"
+"Clic dret en una classe per a obrir l'agent de refactorització.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tipus de retorn desconegut"
+#: 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 ""
+"<p>Els objectes en el diagrama de seqüències poden tenir una caixa de "
+"destrucció i ser mostrats com a actors.\n"
+"Fent doble clic en el diàleg Propietats.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Error sense especificar"
+#: 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 ""
+"<p>Els missatges de diagrama de seqüència poden actuar com a constructors.  "
+"Feu clic a la caixa de l'objecte (més bé sobre la línia vertical) per a "
+"tornar-lo un constructor.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Afegeix classe base"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Els diagrames de seqüència accepten missatges a si mateix.  Feu clic una "
+"altra vegada en la mateixa línia vertical per a crear un auto missatge.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Afegeix classe derivada"
+#: 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 ""
+"<p>Si carregant un fitxer extern no es mostra res en la vista en llista, "
+"proveu a desar el model sota un nom diferent,\n"
+"tanqueu-lo, i torneu a carregar el fitxer desat.  Normalment la vista en "
+"llista serà mostrada correctament.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Afegeix operació"
+#: 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 ""
+"<p>Talla i enganxa pot exportar la imatge cap al portapapers en format PNG\n"
+"per a posteriorment enganxar-la al KWord o d'altres aplicacions.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Afegeix atribut"
+#: 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 ""
+"<p>Les associacions no tenen perquè estar en línies rectes, fent doble clic "
+"a sobre d'una crearem un punt movible.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Afegeix interfície base"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Podeu activar l'auto desat en el diàleg de configuració d'Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Afegeix interfície derivada"
+#: 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 ""
+"<p>Trobeu a faltar cap característica en Umbrello? Si us plau, feu-nos-ho "
+"saber.\n"
+"Afegiu-la a la base de dades d'errors reportats mitjançant un informe "
+"d'error des del mateix menú Ajuda de l'aplicació o envieu-nos-la a la llista "
+"de correu uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a></li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Classificadors base"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Podeu esborrar tots els objectes seleccionats prement les tecles Supr o "
+"Retrocés.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Classificadors derivats"
+#: 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 ""
+"<p>Si trobeu un error (bug) a Umbrello, si us plau, feu-nos-ho saber.\n"
+"Ens podeu informar dels errors mitjançant l'eina d'informe d'errors\n"
+"que hi ha en el menú Ajuda.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "No es pot crear el directori: %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 ""
+"<p>Prement la tecla Esc s'estableix a l'eina actual a l'eina seleccionada.\n"
+"La de Retrocés salta a l'eina emprada anteriorment.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "No es pot desar un diagrama buit"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Podeu seleccionar tots els objectes prement Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Ha succeït un problema mentre es desava el diagrama en %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 ""
+"<p>Podeu crear i configurar una nova classe usant l'Assistent de nova classe "
+"en el menú Codi.</p>\n"
diff --git a/tde-i18n-cs/messages/tdesdk/umbrello.po b/tde-i18n-cs/messages/tdesdk/umbrello.po
index 58ed8400964..f96333426a2 100644
--- a/tde-i18n-cs/messages/tdesdk/umbrello.po
+++ b/tde-i18n-cs/messages/tdesdk/umbrello.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-01-15 19:54+0100\n"
 "Last-Translator: Klara Cihlarova <koty@seznam.cz>\n"
 "Language-Team: Czech <suse@suse.cz>\n"
@@ -18,253 +18,211 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Autoři Umbrello UML modelátoru"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Soubor k otevření"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 autoři Umbrello UML modelátoru"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Tomáš Němec, Lukáš Tinkl, Radek Malčic,Klára Cihlářová"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autoři Umbrello UML modelátoru"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "borg.dax@quick.cz,lukas@kde.org,malcic@atlas.cz,koty@seznam.cz"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Exportovat jako obrázek..."
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Zadejte název aktivity:"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr "Zadejte název nové aktivity:"
 
-#: 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 "Nastala chyba při ukládání souboru: %1"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Zarovnat vlevo"
 
-#: 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 "Chyba při ukládání"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Zarovnat vpravo"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Zarovnat nahoru"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synchronní zpráva"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Zarovnat dolů"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynchronní zpráva"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Zarovnat vertikálně"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Asociace"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Zarovnat horizontálně"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Kotva"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Zarovnat vertikálně"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ukotvení"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Zarovnat horizontálně"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Popisek"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Pro zarovnání musíte vybrat minimálně 2 objekty (např. třídy nebo "
+"účastníky). Nemůžete zarovnat asociace."
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Poznámka"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formátování"
 
-#: worktoolbar.cpp:253
-msgid "Box"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
 msgstr ""
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Účastník"
-
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Závislost"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Zobecnění"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregace"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Vztah"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Jednosměrná asociace"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementace (Zobecnění/Realizace)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompozice"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Případy užití"
-
-#. 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 "Třída"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Začátek stavu"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Konec stavu"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Větvit/Spojit"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Rozvětvení/Spojení"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Balíček"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponenta"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Uzel"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Závislost"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Asociace"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Rozhraní"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Samopřidružení"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datový typ"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Zpráva spolupráce"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Výčet"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sekvenční zpráva"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entita"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Automatická zpráva spolupráce"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr ""
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Automatická zpráva sekvence"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Kotva"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Spojení"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompozice"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Rozvětvení"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizace"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ukotvení"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Změna stavu"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Změna aktivity"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktivita"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stav"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Násobnost"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Konec aktivity"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Zadejte násobnost:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Začátek aktivity"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Název asociace"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Zpráva"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Zadejte název asociace:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Název úlohy"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Zadejte název úlohy:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
+"Operace se stejným názvem a signaturou již existuje. Nemůžete ji přidat "
+"znovu."
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Výběr"
+#: 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 "Toto je neplatný název."
+
+#: 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 "Neplatný název"
+
+#: 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 "Tento název je již používán."
+
+#: 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 "Není jedinečným názvem"
 
 #: 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."
+"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 ""
-"Přinejmenším jedna položka ve schránce nemůže být vložena, protože položka má "
-"tentýž existující název. Ostatní položky byly vloženy."
+"Přinejmenším jedna položka ve schránce nemůže být vložena, protože položka "
+"má tentýž existující název. Ostatní položky byly vloženy."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -275,18 +233,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Nelze otevřít soubor %1 pro zapisování.Je třeba se ujistit, že adresář existuje "
-"a že do něj máte oprávnění k zápisu."
+"Nelze otevřít soubor %1 pro zapisování.Je třeba se ujistit, že adresář "
+"existuje a že do něj máte oprávnění k zápisu."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Nelze otevřít soubor"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Nelze vytvořit adresář:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Nelze vytvořit adresář:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -300,1313 +256,1515 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Nelze vytvořit adresář"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Zadejte název stavu:"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Obecná nastavení"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Zadejte název nového stavu:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Balíček je jmenným prostorem"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Zadejte aktivitu:"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuální destruktory"
 
-#: 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 "Zadejte název nové aktivity:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generovat prázdné konstruktory"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nová aktivita"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generovat metody přidružení"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML model"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operace jsou vložené"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logický pohled"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Přidružení jsou vložené"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Pohled případu užití"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentový pohled"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importuji soubor: %1"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Pohled nasazení"
+#: 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 "Připraven."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datové typy"
-
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
-"Současný soubor byl změněn.\n"
-"Přejete si jej uložit?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Soubor %1 neexistuje."
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Jmenný prostor"
 
-#: 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 "Chyba při nahrávání"
+#: 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 "Třída"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Soubor %1 je poškozen."
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Vnitřní chyba"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Nebyl nalezen žádný XMI soubor v archívu %1."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntaktická chyba před '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Nastala chyba při nahrávání souboru: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Chyba při analýze před '%1'"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Nastala chyba při nahrávání souboru: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Nastala chyba při zpětném nahrávání souboru: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "očekáván výraz"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "Diagram případů užití"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Syntaktická chyba deklarace"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Diagram třídy"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "očekáván znak '}'"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sekvenční diagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "očekáván jmenný prostor"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "Diagram spolupráce"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "očekáván znak '{'"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "stavový diagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "očekáván název jmenného prostoru"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "Diagram aktivit"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Pro deklaraci potřebuji specifikátor typu"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "Diagram komponent"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "očekávána deklarace"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "Diagram nasazení"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "očekáván konstantní výraz"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "očekáván znak ')'"
 
-#: 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 "Název"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "chybí }"
 
-#: 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 "Zadejte název:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "očekáván inicializátor položek"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Neplatný název pro diagram."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "očekáván specifikátor základní·třídy"
 
-#: 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 "Neplatný název"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "očekávána podmínka inicializátoru"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Diagram již používá tento název."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "očekáván identifikátor"
 
-#: 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 "Není jedinečným názvem"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "očekáván id typu"
 
-#: 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 "Toto je neplatný název."
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "očekáván název třídy"
 
-#: 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 "Tento název je již používán."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "očekávána podmínka"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Zadaný název není jedinečný!\n"
-"Opravdu jste toto chtěli?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "očekáván příkaz"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Název není jedinečný"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "očekávána inicializace for"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Použít název"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "očekáván catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Zadejte nový název:"
+#: 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 "&Vlastnosti"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Opravdu chcete odstranit diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Začátek aktivity"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Smazat diagram"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Konec aktivity"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Nastavuji dokument..."
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Větvit/Spojit"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Rozvětvení/Spojení"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Nahrávání UML elementů...."
+#: 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 "Obecné"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Nahrávání diagramů..."
+#: 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 "Obecné vlastnosti"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Diagram TDE UML"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Typ aktivity:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr ""
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Název aktivity:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: 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 "Komentáře"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Zadejte název modelu"
+#: 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 "Písmo:"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Zadejte nový název modelu:"
+#: 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 "Nastavení písem"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Pohledy"
+#: 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 "Barva"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Název, který jste zadali, je neplatný.\n"
-"Proces vytváření byl zrušen."
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Barva widgetu"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Neplatný název"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivity"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Zadaný název není jedinečný!\n"
-"Proces vytváření byl zrušen."
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nová aktivita..."
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Smazat ukotvení"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr ""
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Přejmenovat"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Adresář musí být napřed vyprázdněn, než bude smazán."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nová aktivita"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Adresář není prázdný"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nová aktivita"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Operace se stejným názvem a signaturou již existuje. Nemůžete ji přidat znovu."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Přejmenovat aktivitu"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Zadejte název aktivity:"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Zadejte nový název aktivity:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nový stav"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Název:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Zobecnění"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Typ:"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Samopřidružení"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Asociace"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Zpráva spolupráce"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Vlastnosti asociace"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sekvenční zpráva"
+#: 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 "Obecná nastavení"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Automatická zpráva spolupráce"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Úlohy"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Automatická zpráva sekvence"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Nastavení úlohy"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizace"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Písmo asociace"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr ""
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Vlastnosti úlohy A"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Vlastnosti úlohy B"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Viditelnost úlohy A"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nový"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Viditelnost úlohy B"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Z&obrazit"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Modifikovatelnost úlohy A"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
-msgstr "&Kód"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Modifikovatelnost úlohy B"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Aktivní jazyk"
+msgid "Rolename:"
+msgstr "Název úlohy:"
 
-#. 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
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Documentation"
-msgstr "Komentáře"
+msgid "Multiplicity:"
+msgstr "Násobnost:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Lomítko-Lomítko (//)"
+msgid "Public"
+msgstr "Veřejný"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Lomitko-Hvězdička (/*  */)"
+msgid "Private"
+msgstr "Soukromý"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: 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 "Style:"
-msgstr "Styl:"
+msgid "Protected"
+msgstr "Chráněný"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ generátor kódu</p>"
+msgid "Implementation"
+msgstr "Implementace"
 
-#. 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
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "General"
-msgstr "Obecné"
+msgid "Changeable"
+msgstr "Modifikovatelný"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Metoda generování kódu"
+msgid "Frozen"
+msgstr "Zmrazený"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Při generování kódu použijte pro třídy toto nastavení:"
+msgid "Add only"
+msgstr "Pouze přidat"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Název třídy:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Název účastníka:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Proměnná</b>"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Název balíčku:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Název případu užití:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Název rozhraní:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "řetězec"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Název komponenty:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Řetězec</p>"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Název artefaktu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Katalog</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Název výčtu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Název datového typu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globální?</i>"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Název entity:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Název &stereotypu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Název &balíčku:"
+
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstraktní třída"
+
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Spustitelný"
+
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Kreslit jako"
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Výchozí"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Výplň:"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Knihovna"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabulka"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Viditelnost"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Veřejný"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&Soukromý"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Chrá&něný"
+
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "I&mplementace"
+
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
 msgstr "Název třídy:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<p align=\"center\">Vložit soubor</p>"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Název instance:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generování projektu"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Kreslit jako účastníka"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Násobná instance"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Zobrazit desktrukci"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Název komponenty:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Název uzlu:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Název stereotypu:"
+
+#: 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 ""
+"Název, který jste zvolili,\n"
+"je již používán. Název byl\n"
+"vrácen na původní."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Metody automatického generování"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Název není jedinečný"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Metody prázdných konstruktorů"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributy"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Metody přidružení asociace"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ový atribut..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Metody přidružení atributu"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operace"
 
-#. 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 "Veřejný"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nová operac&e..."
 
-#. 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 "Soukromý"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Šablony"
 
-#. 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 "Chráněný"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "No&vá šablona..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Z rodičovského objektu"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Výčet znaků"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Výchozí rozsah atributu přidružení:"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Nový výčet znaků..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Výchozí rozsah asociace pole:"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributy entity"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Z rodičovské úlohy"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Nový atribut &entity..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java generátor kódu</p>"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Smazat ukotvení"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr ""
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Vlastnosti"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr ""
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Zobrazit"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby generátor kódu</p>"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operac&e"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Viditelnost"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Signatura o&perace"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Balíče&k"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributy"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&yp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Signatura atr&ibutu"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Kreslit jako kruh"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Zobrazení"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Nastavení zobrazení"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Nastavení atributů"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Nastavení operace"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Nastavení šablony"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Nastavení výčtu znaků"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Nastavení atributů"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Kotva"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Nastavení obsahu"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Asociace třídy"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nová_třída"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nová třída"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributy třídy"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operace třídy"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Volby generování kódu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Jazyk"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generovat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Adresáře"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Dokončit"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Zapsat všechny vytvořené soubory do adresáře:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kód vygenerován"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Prohlížet..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Kód nevygenerován"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "P&rohlížet..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Dosud nevygenerován"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Včetně hlavičkových souborů z adresáře:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Adresář %1 neexistuje. Chcete jej nyní vytvořit?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Soubory vytvořené generátorem kódu budou zapsány do tohoto adresáře"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Adresář pro výstup neexistuje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Vytvořit adresář"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Nevytvářet"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Soubory v tomto adresáři budou použity jako hlavičkové soubory při generování "
-"kódu"
+"Adresář nemohl být vytvořen.\n"
+"Ujistěte se prosím, že máte oprávnění zapisovat do nadřazeného adresáře nebo "
+"vyberte jiný platný adresář."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Metoda přepisování"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Chyba při vytváření adresáře"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Vyberte prosím platný adresář."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Jestliže existuje soubor se shodným názvem,\n"
-"který chce použít generátor kódu jako výstupní soubor:"
+"Adresář pro výstup existuje, ale nemáte oprávnění pro zápis.\n"
+"Nastavte prosím příslušné oprávnění nebo vyberte jiný adresář."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Přepsat"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Chyba při zápisu do adresáře výstupu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Přepsat existující soubory, pokud jsou v cílovém adresáři"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 nevypadá jako adresář. Vyberte prosím platný adresář."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Dotázat se"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Vyberte prosím platný adresář"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Jestliže existuje soubor se stejným názvem, zeptat se, co dál"
+msgid "Code Viewer"
+msgstr "Prohlížeč kódu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Po&užít jiný název"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Žádné dostupné volby.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Jestliže již soubor existuje v cílovém adresáři, vyberte jiný název připojením "
-"přípony ke jménu"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formátování"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtr"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Čáry"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Současný diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Styl zakončení čáry:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Všechny di&agramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Typ odsazení:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "V&ybrat diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Počet odsazení:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Typ diagramu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Výběr"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Případy užití"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Spolupráce"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvence"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stav"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Diagram TDE UML"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Není vybrán žádný diagram."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr ""
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Poznámka komentáře"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Cílový soubor již existuje"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Soubor %1 již existuje v %2.\n"
+"\n"
+"Umbrello může přepsat soubor, vytvořit podobné\n"
+"jméno souboru nebo nevytvořit tento soubor vůbec."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "Použít n&a zbývající soubory"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Žádné odsazení"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Přepsat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulátor"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "Vytvořit podobné &jméno souboru"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Mezera"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Ne&generovat soubor vůbec"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Nastavení komentáře"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Vlastnosti parametru"
 
-#. 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/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Typ:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Název:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Výchozí hodnota:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
-"Zapsat &komentáře k sekcím,\n"
-"i když je sekce prázdná"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Zapsat komentáře k označení rozdílné sekce (veřejné, soukromé) v třídách, i "
-"když jsou sekce prázdné"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Zapsat komentáře, i když jsou prázdné"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Obsahuje položky"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Zapsat komentáře pro třídy a &metody, i když jsou prázdné"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Vybrat operaci"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Volby jazyka"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Číslo sekvence:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Průvodce generováním kódu"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operace s třídou:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Vybrat třídy"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Vlastní operace:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Nastavení Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Uživatelské rozhraní"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Nastavení uživatelského rozhraní"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Barva čáry:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Výc&hozí barva"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Barva výplně:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Vý&chozí barva"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Délka čáry:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "V&ýchozí délka"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "Po&užít barvu výplně"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Umístěte všechny třídy, pro které chcete generovat kód\n"
-"do seznamu na pravé straně"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Přidat třídu pro generování kódu"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Povolit krok zpět"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Vybrané třídy"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Odstranit třídu z generování kódu"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Dostupné třídy"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Výchozí rozsah asociace pole:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Stav generování kódu"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatické ukládání"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Stiskněte tlačítko Generovat pro zahájení generování kódu"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Povolit automatické ukládá&ní"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Stav generování"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Zvolte interval automatického ukládání (minuty):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Prohlížeč kódu"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Přípona automatického ukládání:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Zobrazit skryté bloky kódu"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">sem patří název komponenty</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Spuštění"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Zobrazit typ bloku"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logo při spuštění"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Barvy"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Tip dne"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Písmo:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Načíst pos&lední projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papír:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Spustit nový projekt s:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Vybráno:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Žádný diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML objektový blok:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagram třídy"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skrytý blok kódu:  </p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagram případů užití"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"center\">Needitovatelný text:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sekvenční diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Editovatelný text:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagram spolupráce"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Vlastnosti diagramu"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Stavový diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Název:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagram aktivit"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zvětšení:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagram komponent"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagram nasazení"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
-msgstr "Zobrazit příznakové operace"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Nastavení třídy"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Zobrazit &mřížku"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Zobrazit &viditelnost"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Přichy&távat k mřížce"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Zobrazit atributy"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Přichytávat velikost komponenty"
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Zobrazit operace"
 
-#. 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."
-msgstr ""
-"Přichytit velikost komponent k násobku rozestupu mřížky.\n"
-"Jestliže je povoleno přichytávání k mřížce, komponenta bude vždy zarovnaná k "
-"mřížce na všech 4 stranách."
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Zobrazit stereot&yp"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Rozteč mřížky:  "
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Zobrazit signaturu atributu"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Zobrazit balíček"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
-msgid "Y"
-msgstr "Y"
+msgid "Show operation signature"
+msgstr "Zobrazit příznakové operace"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Délka čáry:"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Výchozí rozsah platnosti"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Exportovat jako obrázek..."
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Výchozí rozsah atributu:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Výchozí rozsah operace:"
 
-#. 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"
-msgstr ""
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generování kódu"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Typ stavu:"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Nastavení generování kódu"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Nastavení prohlížeče kódu"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "adresář"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Začátek stavu"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Konec stavu"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
-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)."
-msgstr ""
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Typ stavu:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Vlastnosti úlohy"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Název stavu:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Název úlohy:"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Barva widgetu"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Násobnost:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Vlastnosti atributu"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Modifikovatelnost úlohy"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Roz&sah klasifikátoru (\"statické\")"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Pouze přidat"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Veřejný"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zmrazený"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Chrá&něný"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Modifikovatelný"
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementace"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Viditelnost úlohy"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Zadali jste neplatný název atributu."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementace"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Neplatný název atributu"
 
-#: tips.txt:3
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Název atributu, který jste zvolili, je již v této operaci používán."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Název atributu není jedinečný"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
 msgstr ""
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Výchozí hodnota:"
 
-#: 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/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
-"<p>Pokud chcete přidat exisstující třídu do diagramu, přetáhněte její vstup ze "
-"stromového pohledu.</p>\n"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 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/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
-"<p>Diagram sekvenčního objektu má destrutor a je zobrazen jakou účastník.  "
-"Dvojklikem se dostanete do dialogu nastavení.</p>\n"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributy:"
 
-#: 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/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "Žád&ný"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primární"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Re&jstřík"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
 msgstr ""
-"<p>Vyjmout a kopírovat taktéž exportují PNG obrázky do schránky které mohou být "
-"vloženy do KWordu nebo jiné aplikace.</p>\n"
 
-#: tips.txt:66
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Zadali jste neplatný název atributu entity."
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Neplatný název atributu entity"
+
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Asociace nesmí být přímé čáry, dvojklik na jednu z nich vytvoří pohyblivý "
-"bod.</p>\n"
+"Název atributu entity, který jste zvolili, je již v této operaci používán."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Název atributu entity není jedinečný"
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Vlastnosti operace"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstraktní operace"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
-"<p>Automatické ukládání se zapíná v konfiguračním dialogu Umbrello.</p>\n"
 
-#: tips.txt:76
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametry"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Nový parametr..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Zadali jste neplatné jméno parametru."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Neplatné jméno parametru"
+
+#: dialogs/umloperationdialog.cpp:339
 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"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Existuje nějaká vlastnost, která vám v Umbrellu chybí? Řekněte nám o ní. \n"
-"Můžete nám o ní napsat do chybové databáze Umbrello\n"
-"nebo poslat e-mail do vývojové konference.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+"Název parametru, který jste zvolili,\n"
+"je již v této operaci používán."
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Název parametru není jedinečný"
+
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Pro smazání všech vybraných objektů stiskněte Del nebo Backspace.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Název parametru, který jste zvolili, je již v této operaci používán."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Zadali jste neplatný název operace."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Neplatný název operace"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operace s touto signaturou již existuje v %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Vyberte jiný název nebo parametr katalogu."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Vlastnosti úlohy"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Vlastnosti šablony"
 
-#: tips.txt:91
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Byl zadán neplatný název šablony."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Neplatný název šablony"
+
+#: dialogs/umltemplatedialog.cpp:138
 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"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Jestliže naleznete chybu v Umbrello, prosím dejte nám vědět.\n"
-"Je možné předložit chybu pomocí hlášení chyb v seznamu nápovědy.</p>\n"
+"Název parametru šablony, který jste zvolili, je již v této operaci používán."
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Název šablony není jedinečný"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Volba zobrazení tříd"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Barvy diagramu"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Název, který jste zadali, je neplatný."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Název, který jste zadali, není jedinečný."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Název není jedinečný"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "Čá&ra"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Výplň:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "V&ýchozí"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "Po&užít výplň"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Exportovat jako obrázek..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p>Stisk klávesy ESC nastaví aktuální nástroj jako vybraný.\n"
-"Klávesa Backspace skočí na přechozí použitý nástroj.</p>\n"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</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 "Nastala chyba při ukládání souboru: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Chyba při ukládání"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Autoři Umbrello UML modelátoru"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Soubor k otevření"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>Všech objekty vyberete stisknutím Ctrl-A.</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Můžete vytvořit a nastavit novou třídu pomocí Průvodce novou třídou v "
-"nabídce Kód.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 autoři Umbrello UML modelátoru"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autoři Umbrello UML modelátoru"
+
+#: 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 "Název"
+
+#: 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 "Zadejte název:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Zadejte název operace:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Zadejte nový text:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "CHYBA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Změnit text"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Soubor %1 neexistuje."
+
+#: 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 "Chyba při nahrávání"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Soubor %1 nelze otevřít."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1660,6 +1818,10 @@ msgstr "Nová operace..."
 msgid "Select Operation..."
 msgstr "Vybrat operaci..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Změnit text..."
@@ -1711,6 +1873,19 @@ msgstr "Nový"
 msgid "Rename..."
 msgstr "Přejmenovat..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Chyba při vložení"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Barva čáry..."
@@ -1739,14 +1914,26 @@ msgstr ""
 msgid "Import Classes..."
 msgstr "Importovat třídy..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Balíček"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagram komponent..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Uzel"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagram nasazení..."
@@ -1755,10 +1942,18 @@ msgstr "Diagram nasazení..."
 msgid "Folder"
 msgstr "Adresář"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entita"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr ""
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Účastník"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagram případů užití..."
@@ -1795,6 +1990,18 @@ msgstr "Nový atribut entity..."
 msgid "Export as Picture..."
 msgstr "Exportovat jako obrázek..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Rozhraní"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datový typ"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Výčet"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagram třídy..."
@@ -1815,26 +2022,10 @@ msgstr "Sekvenční diagram..."
 msgid "Collaboration Diagram..."
 msgstr "Diagram spolupráce..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributy"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operace"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Pouze veřejný"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Viditelnost"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Signatura operace"
@@ -1847,11 +2038,6 @@ msgstr "Signatura atributu"
 msgid "Stereotype"
 msgstr "Stereotyp:"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Zobrazit"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribut..."
@@ -1876,14 +2062,6 @@ msgstr "Barva výplně..."
 msgid "Use Fill Color"
 msgstr "Použít barvu výplně"
 
-#: 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 "Barva"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Účastník..."
@@ -1912,10 +2090,26 @@ msgstr "Výčet..."
 msgid "Package..."
 msgstr "Balíček..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Začátek stavu"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Konec stavu"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stav..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Začátek aktivity"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Konec aktivity"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -1961,6 +2155,14 @@ msgstr "Smazat ukotvení"
 msgid "Change Association Name..."
 msgstr "Změnit název asociace..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Vyčistit diagram"
@@ -1995,194 +2197,103 @@ 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 "(c) 2001 Paul Hensgen, (c) 2002-2006 autoři Umbrello UML modelátoru"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Nekorektní použití přidružení."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Chyba v asociaci"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Soubor %1 neexistuje."
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nový_účastník"
 
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Soubor %1 nelze otevřít."
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nový_případužití"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Tomáš Němec, Lukáš Tinkl, Radek Malčic,Klára Cihlářová"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nový_balíček"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "borg.dax@quick.cz,lukas@kde.org,malcic@atlas.cz,koty@seznam.cz"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nová_komponenta"
 
-#: 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 "Připraven."
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nový_uzel"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nový_artefakt"
 
-#: 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 ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nové_rozhraní"
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr ""
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nový_datatyp"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nový_výčet"
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Jmenný prostor"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nová_entita"
 
-#: codeimport/classimport.cpp:34
+#: model_utils.cpp:264
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importuji soubor: %1"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Vnitřní chyba"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntaktická chyba před '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Chyba při analýze před '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "očekáván výraz"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Syntaktická chyba deklarace"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "očekáván znak '}'"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "očekáván jmenný prostor"
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "očekáván znak '{'"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "očekáván název jmenného prostoru"
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Pro deklaraci potřebuji specifikátor typu"
-
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "očekávána deklarace"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "očekáván konstantní výraz"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "očekáván znak ')'"
+msgid "new_folder"
+msgstr "nový_uzel"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "chybí }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nová_asociace"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "očekáván inicializátor položek"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nový_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "očekáván specifikátor základní·třídy"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "očekávána podmínka inicializátoru"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Prázdný"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "očekáván identifikátor"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "očekáván id typu"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "očekáván název třídy"
+#: 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"
-msgstr "očekávána podmínka"
+#: 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"
-msgstr "očekáván příkaz"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "očekávána inicializace for"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Toto je rezervované slovo jazyka nastaveného v generátoru kódů."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "očekáván catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Rezervované klíčové slovo"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2196,105 +2307,66 @@ msgstr "Zadejte název objektu:"
 msgid "new_parameter"
 msgstr "nový_parametr"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Obecná nastavení"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Balíček je jmenným prostorem"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuální destruktory"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generovat prázdné konstruktory"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generovat metody přidružení"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operace jsou vložené"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Přidružení jsou vložené"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr ""
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2, strana %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Zadejte název diagramu"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Přidat základní třídu"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Zadejte nový název diagramu:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Přidat odvozenou třídu"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Chystáte se smazat celý diagram.\n"
-"Jste si jisti?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Přidat operaci"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Smazat diagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Přidat atribut"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Přidat základní rozhraní"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Přidat odvozené rozhraní"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Klasifikátor základní třídy"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Zadaný název je neplatný!\n"
-"Proces přejmenování byl ukončen."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Odvozené klasifikátory"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nová_asociace"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Zadejte název stavu:"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nový_atribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Zadejte název nového stavu:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nová_šablona"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Zadejte aktivitu:"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nová_operace"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Nekorektní použití přidružení."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nový_znak"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Chyba v asociaci"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nové_pole"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nový stav"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2449,11 +2521,6 @@ msgstr "&Exportovat jako obrázek..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Exportovat jako obrázek..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Vlastnosti"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Jezdec zvětšování"
@@ -2538,6 +2605,13 @@ msgstr "&Komentáře"
 msgid "Opening file..."
 msgstr "Otevírám soubor..."
 
+#: 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 "Vytvářím nový dokument..."
@@ -2545,8 +2619,8 @@ msgstr "Vytvářím nový dokument..."
 #: uml.cpp:673
 #, fuzzy
 msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.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"
@@ -2582,6 +2656,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 archivovaný XMI soubor\n"
 "*|Všechny soubory"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2590,6 +2668,10 @@ msgstr ""
 "Soubor již %1 existuje.\n"
 "Přejete si jej přepsat?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Přepsat"
@@ -2625,11 +2707,11 @@ msgstr "Vkládám obsah schránky..."
 
 #: 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 ""
-"Umbrello nemohl vložit obsah schránky. Objekt ve schránce má nesprávný typ pro "
-"vložení."
+"Umbrello nemohl vložit obsah schránky. Objekt ve schránce má nesprávný typ "
+"pro vložení."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2683,1254 +2765,1272 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr "Vyberte kód k importování"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Název třídy:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Název účastníka:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nový_atribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Název balíčku:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nová_šablona"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Název případu užití:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nová_operace"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Název rozhraní:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nový_znak"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Název komponenty:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nové_pole"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Název artefaktu:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML model"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Název výčtu:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logický pohled"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Název datového typu:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Pohled případu užití"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Název entity:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentový pohled"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Název &stereotypu:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Pohled nasazení"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Název &balíčku:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstraktní třída"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datové typy"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Současný soubor byl změněn.\n"
+"Přejete si jej uložit?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Spustitelný"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Soubor %1 neexistuje."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Kreslit jako"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Soubor %1 je poškozen."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Výchozí"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Nebyl nalezen žádný XMI soubor v archívu %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Knihovna"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Nastala chyba při nahrávání souboru: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabulka"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Nastala chyba při nahrávání souboru: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Veřejný"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Nastala chyba při zpětném nahrávání souboru: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&Soukromý"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "Diagram případů užití"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Chrá&něný"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Diagram třídy"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "I&mplementace"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sekvenční diagram"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Název třídy:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "Diagram spolupráce"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Název instance:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "stavový diagram"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Kreslit jako účastníka"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "Diagram aktivit"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Násobná instance"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "Diagram komponent"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Zobrazit desktrukci"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "Diagram nasazení"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Název komponenty:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Název uzlu:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Neplatný název pro diagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Název stereotypu:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Diagram již používá tento název."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Název, který jste zvolili,\n"
-"je již používán. Název byl\n"
-"vrácen na původní."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Název není jedinečný"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "Čá&ra"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Výplň:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "V&ýchozí"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "Po&užít výplň"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivity"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nová aktivita..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Přejmenovat"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nová aktivita"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Přejmenovat aktivitu"
+"Zadaný název není jedinečný!\n"
+"Opravdu jste toto chtěli?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Zadejte nový název aktivity:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Použít název"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Vlastnosti asociace"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Zadejte nový název:"
 
-#: 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 "Obecná nastavení"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Opravdu chcete odstranit diagram %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Úlohy"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Smazat diagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Nastavení úlohy"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Nastavuji dokument..."
 
-#: 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 "Nastavení písem"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Písmo asociace"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Nahrávání UML elementů...."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Vlastnosti šablony"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Nahrávání diagramů..."
 
-#: 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 "Obecné vlastnosti"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Typ:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Název:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Zadejte název modelu"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Byl zadán neplatný název šablony."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Zadejte nový název modelu:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Neplatný název šablony"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Pohledy"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"Název parametru šablony, který jste zvolili, je již v této operaci používán."
+"Název, který jste zadali, je neplatný.\n"
+"Proces vytváření byl zrušen."
 
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Název šablony není jedinečný"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Neplatný název"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
+"Zadaný název není jedinečný!\n"
+"Proces vytváření byl zrušen."
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Výchozí hodnota:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr ""
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Adresář musí být napřed vyprázdněn, než bude smazán."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributy:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Adresář není prázdný"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "Žád&ný"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primární"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Re&jstřík"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Zadali jste neplatný název atributu entity."
-
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Neplatný název atributu entity"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistviewitem.cpp:478
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Název atributu entity, který jste zvolili, je již v této operaci používán."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Název atributu entity není jedinečný"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Zobrazení"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Volba zobrazení tříd"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Barvy diagramu"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Název, který jste zadali, je neplatný."
-
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Název, který jste zadali, není jedinečný."
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Typ:"
-
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Nastavení Umbrello"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Uživatelské rozhraní"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Nastavení uživatelského rozhraní"
-
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Barva čáry:"
-
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Výc&hozí barva"
-
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Barva výplně:"
-
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Vý&chozí barva"
-
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Délka čáry:"
+"Zadaný název je neplatný!\n"
+"Proces přejmenování byl ukončen."
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "V&ýchozí délka"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2, strana %1"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "Po&užít barvu výplně"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Zadejte název diagramu"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Povolit krok zpět"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Zadejte nový název diagramu:"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
+"Chystáte se smazat celý diagram.\n"
+"Jste si jisti?"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr ""
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Smazat diagram?"
 
-#: dialogs/settingsdlg.cpp:120
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "Výchozí rozsah asociace pole:"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatické ukládání"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Povolit automatické ukládá&ní"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Zvolte interval automatického ukládání (minuty):"
+msgid "Exporting view..."
+msgstr "Ukončuji..."
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Přípona automatického ukládání:"
+#: 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 ""
+"Vybraný soubor %1 již existuje.\n"
+"Chcete jej přepsat?"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Spuštění"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logo při spuštění"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Tip dne"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Soubor již existuje"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Načíst pos&lední projekt"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Nelze vytvořit adresář"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Spustit nový projekt s:"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Nemohu uložit prázdný diagram"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Žádný diagram"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagram třídy"
+#: 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:184
-msgid "Use Case Diagram"
-msgstr "Diagram případů užití"
+#: 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 "Sequence Diagram"
-msgstr "Sekvenční diagram"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagram spolupráce"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synchronní zpráva"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Stavový diagram"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynchronní zpráva"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagram aktivit"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Popisek"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagram komponent"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Poznámka"
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagram nasazení"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Nastavení třídy"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Vztah"
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Zobrazit &viditelnost"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Jednosměrná asociace"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Zobrazit atributy"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementace (Zobecnění/Realizace)"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Zobrazit operace"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Zobrazit stereot&yp"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Zobrazit signaturu atributu"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Spojení"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Zobrazit balíček"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Rozvětvení"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Výchozí rozsah platnosti"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Výchozí rozsah atributu:"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Výchozí rozsah operace:"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Změna aktivity"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generování kódu"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Zpráva"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Nastavení generování kódu"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Nastavení prohlížeče kódu"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Výběr"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Vlastnosti operace"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstraktní operace"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Roz&sah klasifikátoru (\"statické\")"
+#: 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 "Chrá&něný"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Zobrazit operace"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementace"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametry"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Vyčistit diagram"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Nový parametr..."
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Zadali jste neplatné jméno parametru."
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Zobecnění"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Neplatné jméno parametru"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:339
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
 msgid ""
-"The parameter name you have chosen\n"
-"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 ""
-"Název parametru, který jste zvolili,\n"
-"je již v této operaci používán."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Název parametru není jedinečný"
-
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Název parametru, který jste zvolili, je již v této operaci používán."
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Název asociace"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Zadali jste neplatný název operace."
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Neplatný název operace"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
-"Operace s touto signaturou již existuje v %1.\n"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Vyberte jiný název nebo parametr katalogu."
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Výchozí"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Vlastnosti úlohy A"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Vlastnosti úlohy B"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Lomítko-Lomítko (//)"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Viditelnost úlohy A"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Lomitko-Hvězdička (/*  */)"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Viditelnost úlohy B"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Styl:"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Modifikovatelnost úlohy A"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ generátor kódu</p>"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Modifikovatelnost úlohy B"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Metoda generování kódu"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Obsahuje položky"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Při generování kódu použijte pro třídy toto nastavení:"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Poznámka komentáře"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ový atribut..."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nová operac&e..."
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Proměnná</b>"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Šablony"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "No&vá šablona..."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Výčet znaků"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "řetězec"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Nový výčet znaků..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Řetězec</p>"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributy entity"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Katalog</p>"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Nový atribut &entity..."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Začátek aktivity"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globální?</i>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Konec aktivity"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Typ aktivity:"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Název třídy:"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Název aktivity:"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<p align=\"center\">Vložit soubor</p>"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Barva widgetu"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generování projektu"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Vlastnosti atributu"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Výchozí hodnota:"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Metody automatického generování"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Veřejný"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Metody prázdných konstruktorů"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Zadali jste neplatný název atributu."
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Metody přidružení asociace"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Neplatný název atributu"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Metody přidružení atributu"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Název atributu, který jste zvolili, je již v této operaci používán."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Z rodičovského objektu"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Název atributu není jedinečný"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Výchozí rozsah atributu přidružení:"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Vybrat operaci"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Výchozí rozsah asociace pole:"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Číslo sekvence:"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Z rodičovské úlohy"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operace s třídou:"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java generátor kódu</p>"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Vlastní operace:"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramy"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtr"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby generátor kódu</p>"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Současný diagram"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Jazyk"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Všechny di&agramy"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Adresáře"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "V&ybrat diagramy"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Zapsat všechny vytvořené soubory do adresáře:"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Typ diagramu"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Prohlížet..."
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Výběr"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "P&rohlížet..."
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Spolupráce"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Včetně hlavičkových souborů z adresáře:"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvence"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Soubory vytvořené generátorem kódu budou zapsány do tohoto adresáře"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
+"Soubory v tomto adresáři budou použity jako hlavičkové soubory při "
+"generování kódu"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Není vybrán žádný diagram."
-
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Nastavení zobrazení"
-
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Nastavení atributů"
-
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Nastavení operace"
-
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Nastavení šablony"
-
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Nastavení výčtu znaků"
-
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Nastavení atributů"
-
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Nastavení obsahu"
-
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Asociace"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Metoda přepisování"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Asociace třídy"
+#: 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 ""
+"Jestliže existuje soubor se shodným názvem,\n"
+"který chce použít generátor kódu jako výstupní soubor:"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operac&e"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Přepsat"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Viditelnost"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Přepsat existující soubory, pokud jsou v cílovém adresáři"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Signatura o&perace"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Dotázat se"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Balíče&k"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Jestliže existuje soubor se stejným názvem, zeptat se, co dál"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributy"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Po&užít jiný název"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&yp"
+#: 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 ""
+"Jestliže již soubor existuje v cílovém adresáři, vyberte jiný název "
+"připojením přípony ke jménu"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Signatura atr&ibutu"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formátování"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Kreslit jako kruh"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Čáry"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Začátek stavu"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Styl zakončení čáry:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Konec stavu"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Typ odsazení:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Typ stavu:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Počet odsazení:"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Název stavu:"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Barva widgetu"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nová_třída"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nová třída"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Žádné odsazení"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributy třídy"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulátor"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operace třídy"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Mezera"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Vlastnosti parametru"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Nastavení komentáře"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
+"Zapsat &komentáře k sekcím,\n"
+"i když je sekce prázdná"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/codegenerationoptionsbase.ui:436
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"Writes comments to indicate the different sections (public, private etc) in "
+"a class, even if the sections are empty"
 msgstr ""
+"Zapsat komentáře k označení rozdílné sekce (veřejné, soukromé) v třídách, i "
+"když jsou sekce prázdné"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generovat"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Dokončit"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kód vygenerován"
-
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Kód nevygenerován"
-
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Dosud nevygenerován"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Zapsat komentáře, i když jsou prázdné"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Adresář %1 neexistuje. Chcete jej nyní vytvořit?"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Zapsat komentáře pro třídy a &metody, i když jsou prázdné"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Adresář pro výstup neexistuje"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Volby jazyka"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Vytvořit adresář"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Průvodce generováním kódu"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Nevytvářet"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Vybrat třídy"
 
-#: 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 ""
-"Adresář nemohl být vytvořen.\n"
-"Ujistěte se prosím, že máte oprávnění zapisovat do nadřazeného adresáře nebo "
-"vyberte jiný platný adresář."
+"Umístěte všechny třídy, pro které chcete generovat kód\n"
+"do seznamu na pravé straně"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Chyba při vytváření adresáře"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Přidat třídu pro generování kódu"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Vyberte prosím platný adresář."
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Vybrané třídy"
 
-#: 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 ""
-"Adresář pro výstup existuje, ale nemáte oprávnění pro zápis.\n"
-"Nastavte prosím příslušné oprávnění nebo vyberte jiný adresář."
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Odstranit třídu z generování kódu"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Chyba při zápisu do adresáře výstupu"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Dostupné třídy"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 nevypadá jako adresář. Vyberte prosím platný adresář."
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Stav generování kódu"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Vyberte prosím platný adresář"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Stiskněte tlačítko Generovat pro zahájení generování kódu"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Cílový soubor již existuje"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Stav generování"
 
-#: 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."
-msgstr ""
-"Soubor %1 již existuje v %2.\n"
-"\n"
-"Umbrello může přepsat soubor, vytvořit podobné\n"
-"jméno souboru nebo nevytvořit tento soubor vůbec."
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Zobrazit skryté bloky kódu"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "Použít n&a zbývající soubory"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">sem patří název komponenty</p>"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Přepsat"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "Vytvořit podobné &jméno souboru"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Zobrazit typ bloku"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Ne&generovat soubor vůbec"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Barvy"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Žádné dostupné volby.</p>"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Písmo:"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Násobnost"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papír:"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Zadejte násobnost:"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Vybráno:"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Název asociace"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML objektový blok:</p>"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Zadejte název asociace:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skrytý blok kódu:  </p>"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Název úlohy"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"center\">Needitovatelný text:</p>"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Zadejte název úlohy:"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Editovatelný text:</p>"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Zadejte název operace:"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Vlastnosti diagramu"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Zadejte nový text:"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zvětšení:"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "CHYBA"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Změnit text"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Zobrazit &mřížku"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Zarovnat vlevo"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Přichy&távat k mřížce"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Zarovnat vpravo"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Přichytávat velikost komponenty"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Zarovnat nahoru"
+#: 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 ""
+"Přichytit velikost komponent k násobku rozestupu mřížky.\n"
+"Jestliže je povoleno přichytávání k mřížce, komponenta bude vždy zarovnaná k "
+"mřížce na všech 4 stranách."
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Zarovnat dolů"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Rozteč mřížky:  "
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Zarovnat vertikálně"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Zarovnat horizontálně"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Zarovnat vertikálně"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Délka čáry:"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Zarovnat horizontálně"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Exportovat jako obrázek..."
 
-#: 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 ""
-"Pro zarovnání musíte vybrat minimálně 2 objekty (např. třídy nebo účastníky). "
-"Nemůžete zarovnat asociace."
 
-#: object_factory.cpp:164
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Toto je rezervované slovo jazyka nastaveného v generátoru kódů."
+#: 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"
-msgstr "Rezervované klíčové slovo"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Typ stavu:"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Ukončuji..."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "adresář"
 
-#: 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 ""
-"Vybraný soubor %1 již existuje.\n"
-"Chcete jej přepsat?"
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Soubor již existuje"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nový_účastník"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Modifikovatelnost úlohy"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nový_případužití"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Viditelnost úlohy"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nový_balíček"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nová_komponenta"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nový_uzel"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nový_artefakt"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nový"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nové_rozhraní"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Z&obrazit"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nový_datatyp"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zvětšení:"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nový_výčet"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kód"
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nová_entita"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Aktivní jazyk"
 
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "nový_uzel"
+#: 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"
-msgstr "nový_objekt"
+#: 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 "Prázdný"
+#: 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 ""
+"<p>Pokud chcete přidat exisstující třídu do diagramu, přetáhněte její vstup "
+"ze stromového pohledu.</p>\n"
 
-#: 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 ""
+"<p>Diagram sekvenčního objektu má destrutor a je zobrazen jakou účastník.  "
+"Dvojklikem se dostanete do dialogu nastavení.</p>\n"
 
-#: 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"
-msgstr "Přidat základní třídu"
+#: 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"
-msgstr "Přidat odvozenou třídu"
+#: 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"
-msgstr "Přidat operaci"
+#: 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 ""
+"<p>Vyjmout a kopírovat taktéž exportují PNG obrázky do schránky které mohou "
+"být vloženy do KWordu nebo jiné aplikace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Přidat atribut"
+#: 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 ""
+"<p>Asociace nesmí být přímé čáry, dvojklik na jednu z nich vytvoří pohyblivý "
+"bod.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Přidat základní rozhraní"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Automatické ukládání se zapíná v konfiguračním dialogu Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Přidat odvozené rozhraní"
+#: 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 ""
+"<p>Existuje nějaká vlastnost, která vám v Umbrellu chybí? Řekněte nám o "
+"ní. \n"
+"Můžete nám o ní napsat do chybové databáze Umbrello\n"
+"nebo poslat e-mail do vývojové konference.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Klasifikátor základní třídy"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Pro smazání všech vybraných objektů stiskněte Del nebo Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Odvozené klasifikátory"
+#: 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 ""
+"<p>Jestliže naleznete chybu v Umbrello, prosím dejte nám vědět.\n"
+"Je možné předložit chybu pomocí hlášení chyb v seznamu nápovědy.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Nelze vytvořit adresář"
+#: 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 ""
+"<p>Stisk klávesy ESC nastaví aktuální nástroj jako vybraný.\n"
+"Klávesa Backspace skočí na přechozí použitý nástroj.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Nemohu uložit prázdný diagram"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Všech objekty vyberete stisknutím Ctrl-A.</p>\n"
 
-#: 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 ""
+"<p>Můžete vytvořit a nastavit novou třídu pomocí Průvodce novou třídou v "
+"nabídce Kód.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "nový_stereotyp"
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"
diff --git a/tde-i18n-da/messages/tdesdk/umbrello.po b/tde-i18n-da/messages/tdesdk/umbrello.po
index 551c1503d20..7be4d4d91e2 100644
--- a/tde-i18n-da/messages/tdesdk/umbrello.po
+++ b/tde-i18n-da/messages/tdesdk/umbrello.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-08-27 07:59-0400\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -20,248 +20,208 @@ msgstr ""
 "Plural-Forms: \n"
 "Plural-Forms: \n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML Modellerer"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Fil at transformere"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "XSLT-fil at bruge"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML "
-"Modellerersforfatter"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML Modellers forfattere"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Erik Kjær Pedersen"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Eksporterer alle visninger..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "erik@binghamton.edu"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Et antal fejl opstod ved eksport af billederne:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Indtast aktivitetsnavn"
 
-#: 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 "Der var et problem med gemning af filen: %1"
+#: 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 "Indtast navnet på den nye aktivitet:"
 
-#: 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 "Fejl ved at gemme"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Juster til venstre"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Juster til højre"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synkron besked"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Justér til top"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynkron besked"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Justér til bund"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Association"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Juster vertikal midte"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Indeholdte"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Juster horisontal midte"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Anker"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Justér lodret fordeling"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etiket"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Justér vandret fordeling"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Note"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Du skal vælge mindst 2 objekter, som f.eks. klasser eller aktører for at "
+"kunne justere. Du kan ikke justere associationer."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Boks"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatering"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktør"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Afhængighed"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisering"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregering"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Forhold"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Retnings-association"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementerer (Generalisering/Realisering)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Komposition"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Brugsmønster"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Klasse"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Initial tilstand"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Sluttilstand"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Forgren/Indflet"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Opsplit/Sammenføj"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pakke"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponent"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Knude"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Afhængighed"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artifakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Association"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Grænseflade"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Selv-association"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datatype"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Samarbejdsbesked"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enum"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sekvensbesked"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entitet"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Samarbejds-selvbesked"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Lang historik"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sekvens af selvbeskeder"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Kort historik"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Indeholdte"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Sammenføj"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Komposition"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Opsplit"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisering"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Kryds"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni-association"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Valg"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Anker"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Tilstandstransition"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Aktivitetsovergang"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktivitet"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Tilstand"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicitet"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Afslut aktivitet"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Indtast multiplicitet:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Initial aktivitet"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Associationsnavn"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Besked"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Indtast associationsnavn..."
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "UDEFINERET"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rollenavn"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Markér"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Indtast rollenavn:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"En operation med samme navn og underskrift findes allerede. Du kan ikke "
+"tilføje den igen."
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr "Det er et ugyldigt navn."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Ugyldigt navn"
+
+#: 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 "Det navn er allerede i brug."
+
+#: 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 "Ikke et entydigt navn"
 
 #: 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."
+"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 ""
-"Mindst et af punkterne i klippebordet kunne ikke indsættes fordi et punkt med "
-"samme navn allerede eksisterer. Alle andre punkter er blevet indsat."
+"Mindst et af punkterne i klippebordet kunne ikke indsættes fordi et punkt "
+"med samme navn allerede eksisterer. Alle andre punkter er blevet indsat."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -272,18 +232,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Kan ikke åbne filen %1 til skrivning. Sørg venligst for at mappen eksisterer og "
-"at du har tilladelsen til at skrive til den."
+"Kan ikke åbne filen %1 til skrivning. Sørg venligst for at mappen eksisterer "
+"og at du har tilladelsen til at skrive til den."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Kan ikke åbne fil"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kan ikke oprette mappe:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Kan ikke oprette mappe:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -297,1354 +255,1519 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Kan ikke oprette mappe"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Indtast tilstandsnavn"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Generelle indstillinger"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Indtast navnet på den nye tilstand:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Package er et navnerum"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Indtast aktivitet"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuelle destruktører"
 
-#: 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 "Indtast navnet på den nye aktivitet:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generér tomme konstruktører"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "ny aktivitet"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generér adgangsmetoder"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-model"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operationer er indlejrede"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logisk visning"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Accessors er indlejrede"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Brugsmønster-visning"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Accessors er offentlige"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponent-visning"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importerer fil: %1 Fremgang: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Udførelsesvisning"
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Klar."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "E/R-model "
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Er virkefeltet %1 et navnerum eller en klasse?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datatyper"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ import beder om din hjælp"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Den nuværende fil er ændret!\n"
-"Vil du gemme den?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Navnerum"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Filen %1 eksisterer ikke."
+#: 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 "Klasse"
 
-#: 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 "Indlæsningsfejl"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Intern fejl"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Filen %1 ser ud til at være beskadiget."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntaksfejl inden '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Der var ingen XMI fil i den komprimerede fil %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Tolkningsfejl inden '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Der var et problem med at indlæse den udpakkede fil: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Der var et problem med indlæsning af filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "forventet udtryk"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Der var et problem med at uploade filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Syntaksfejl i deklaration"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "brugsmønster-diagram"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} forventet"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klassediagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "forventet navnerum"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sekvensdiagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ forventet"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "samarbejdsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Forventede navn på navnerum"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "tilstandsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "En typespecifikation at deklarere kræves"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "aktivitetsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "forventede en deklaration"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponentdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Forventede konstantudtryk"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "udførselsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' forventet"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "E/R-diagram"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} mangler"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Navn"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Forventede initiering af medlem"
 
-#: 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 "Indtast navn:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Basal klassespecifikator forventet"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Det er et ugyldigt navn for et diagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Forventede initieringsklausul"
 
-#: 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 "Ugyldigt navn"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Forventede identifikator"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Der er allerede et diagram der bruger det navn."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Forventede typeidentifikator"
 
-#: 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 "Ikke et entydigt navn"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Forventede klassenavn"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
-msgstr "Det er et ugyldigt navn."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "forventede betingelse"
 
-#: 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 "Det navn er allerede i brug."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "forventede sætning"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Navnet du indtastede er ikke entydigt.\n"
-"Er dette hvad du ønskede?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "forventede initiering af for"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Navn ikke entydigt"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "forventede catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Brug navn"
+#: 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 "&Egenskaber"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Indtast nyt navn"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Startaktivitet"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Er du sikker på at du ønsker at slette diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Slutaktivitet"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Slet diagram"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Forgren/Indflet"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Sætter dokumentet op..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Opsplit/Sammenføj"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Opløser objektreferencer..."
+#: 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 "Generelt"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Indlæser UML-elementer..."
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "Generelle egenskaber"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Indlæser diagrammer..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Aktivitetstype:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "TDE-UML-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Aktivitetsnavn:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autogem%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 "Dokumentation"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Gør mappe ekstern"
+#: 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 "Skrifttype:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Indtast modelnavn"
+#: 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 "Skrifttypeopsætning"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Indtast modellens nye navn:"
+#: 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 "Farve"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Visninger"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Kontrolfarver"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Navnet du indtastede var ugyldigt.\n"
-"Oprettelsesprocessen er blevet annulleret"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktiviteter"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Navn ikke gyldigt"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Ny aktivitet..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Navnet du indtastede var ikke entydigt!\n"
-"Oprettelsesprocessen er blevet annulleret"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Slet anker"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Oprettelse annulleret"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Omdøb"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Indlæser listevisning..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Ny aktivitet"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Mappen skal være tom før den kan slettes."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "ny aktivitet"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Mappen er ikke tom"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Omdøb aktivitet"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"En operation med samme navn og underskrift findes allerede. Du kan ikke tilføje "
-"den igen."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Indtast det nye navn på aktiviteten:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Indtast aktivitetsnavn"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Navn:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "ny tilstand"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisering"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associationer"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Selv-association"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Associationsegenskaber"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Samarbejdsbesked"
+#: 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 "Generel opsætning"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sekvensbesked"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roller"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Samarbejds-selvbesked"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rolleopsætning"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sekvens af selvbeskeder"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Associationsskrifttype"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisering"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Rolle A egenskaber"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni-association"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Rolle B egenskaber"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Eksportér"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Rolle A synlighed"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Rolle B synlighed"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Ny"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Rolle A ændringsmulighed"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Vis"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Rolle B ændringsmulighed"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kode"
+msgid "Rolename:"
+msgstr "Rollenavn:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktivt s&prog"
+msgid "Multiplicity:"
+msgstr "Multiplicitet:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentation"
+msgid "Public"
+msgstr "Offentlig"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Skråstreg-Skråstreg (//)"
+msgid "Private"
+msgstr "Privat"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Skråstreg-stjerne (/**  */)"
+msgid "Protected"
+msgstr "Beskyttet"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+msgid "Implementation"
+msgstr "Implementation"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ Kodegenerering</p>"
+msgid "Changeable"
+msgstr "Ændringsmulig"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Generelt"
+msgid "Frozen"
+msgstr "Frosset"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Metode-krop generering"
+msgid "Add only"
+msgstr "Tilføj kun"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Brug følgende klasser i genereret kode:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Klassenavn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Aktørnavn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Pakkenavn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variabel</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Brugsmønster-&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Grænseflade&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponent&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "streng"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Navn på overlevning:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Streng</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Enumererings&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Liste</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datatype&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entitets&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotypenavn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Pakkenavn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klassenavn"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstrakt klasse"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Include-filer</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstrakt brugertilfælde"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projekt-generering"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Kørbar"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Opretter ANT bygge-dokument"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Tegn som"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Auto-Genereringsmetoder"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Standard"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Tomme konstruktør-metoder"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Ud&fyld:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Associantions-accessor-metoder"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Bibliotek"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Attribut-accessor-metoder"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabel"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Offentlig"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Synlighed"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Privat"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Offentlig"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Beskyttet"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivat"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Fra overordnet objekt"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&Beskyttet"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Standardattribut-accessor-scope:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentation"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Standard associationsfelt-scope:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klassenavn:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Fra overordnet rolle"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instans-navn:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java-kode generering</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Tegn som aktør"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Nummertegn (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Flere instanser"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Start-slut (=start  =slut)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Vis dekonstruktion"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby kodegenerering</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponentnavn:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Knudenavn:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotypenavn:"
+
+#: 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 ""
+"Navnet du valgte\n"
+"er allerede i brug.\n"
+"Navnet er blevet nulstillet."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Navnet er ikke entydigt"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attributter"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&y attribut..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operationer"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&y operation..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Skabeloner"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&y template..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum litteraler"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&y enum litteral..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entitetsattributter"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&y entitetsattribut..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Slet anker"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Egenskaber"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Vis"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operatio&ner"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Synlighed"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&perationsunderskrift"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&kke"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributter"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&ype"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibutunderskrift"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Tegn som cirkel"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Vis"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Billed-indstillinger"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attributopsætning"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operationsopsætning"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Skabelonopsætning"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Opsætning af enum litteraler"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Opsætning af entitetsattributter"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Indeholdte"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Opsætning af indhold"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klasseassociation"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "new_class"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Ny klasse"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klasseattributter"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klasseoperationer"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Indstillinger for kodegenerering"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Sprog"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generér"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Mapper"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Afslut"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Skriv alle genererede filer til mappen:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kode genereret"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Gen&nemsøg..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ikke genereret"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "G&ennemsøg..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Endnu ikke genereret"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Inkludér header-filer fra mappe:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Mappen %1 eksisterer ikke. Ønsker du at oprette den nu?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Filer genereret af Kode-generator vil blive skrevet til denne mappe"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Uddata-mappe eksisterer ikke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Opret mappe"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Opret ikke"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Filer i denne mappe vil blive brugt som header-filer i den genererede kode"
+"Mappen kunne ikke oprettes.\n"
+"Sørg venligst for at du har skriveadgang til dens overmappe eller vælg en "
+"anden, gyldig mappe."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Overskrivepolitik"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Fejl ved oprettelse af mappe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Vælg venligst en gyldig mappe"
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Hvis en fil med det samme navn som kode-generatoren\n"
-"ønsker at bruge som uddatafil eksisterer allerede:"
+"Uddatamappen eksistere, men er ikke skrivbar.\n"
+"Sæt venligst passende tilladelser eller vælg en anden mappe."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "O&verskriv"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Fejl ved at skrive til uddata-mappe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Overskriv eksisterende filer hvis de er i målmappen"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 synes ikke at være en mappe. Vælg venligst en gyldig mappe."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "S&pørg"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Vælg venligst en gyldig mappe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Hvis en fil med samme navn allerede eksisterer, så spørg hvad der skal gøres"
+msgid "Code Viewer"
+msgstr "Kode-viser"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Brug et andet navn"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Ingen tilgængelige tilvalg.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Hvis en fil allerede eksisterer i målmappen, så vælg et andet navn at bruge ved "
-"at tilføje en endelse til filnavnet"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatering"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linjer"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Dette diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Stil for linjeafslutning:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Alle diagrammer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Indentation Type:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Vælg diagrammer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Indrykningsmængde"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Diagramtype"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Markering"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Brugsmønster"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Samarbejde"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Ingen indrykning"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvens"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Faneblad"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Tilstand"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Mellemrum"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponent"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Kommentar verbositet"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Anvendelse"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "TDE-UML-Diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Intet diagram valgt."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Formatet som billederne vil blive eksporteret til"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Note dokumentation"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Målfil eksisterer allerede"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Skriv kommentarer &for afsnit selv om afsnittet \n"
-"er tomt"
+"Filen %1 eksisterer allerede i %2.\n"
+"\n"
+"Umbrello kan overskrive filen, generere et lignende\n"
+"filnavn eller ikke generere denne fil."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Anvend på alle tilbageværende filer"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Overskriv"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generér lignende filnavn"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Generér ikke fil"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameteregenskaber"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Type:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Navn:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Begyndelsesværdi:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Overførselsretning"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Skriver kommentarer for at indikere de forskellige sektioner (offentlig, privat "
-"osv.) i en klasse, selv om sektionerne er tomme"
+"\"ind\" er en læs kun parameter, \"ud\" er en skriv kun parameter og \"inout"
+"\" er til både at læse og skrive."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "S&kriv dokumentationskommentarer selv når de er tomme"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Indeholdte punkter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Skriv kommentarer &for klasse- og metodedokumentation selv om de er tomme"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Vælg operation"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Sprogvalg"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sekvensnummer:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Kodegenereringsguide"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klasseoperation:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Vælg klasser"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Brugerindrettet operation:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Umbrello's opsætning"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Brugergrænseflade"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Opsætning af brugergrænseflade"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Linjefarve:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "S&tandard farve"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Udfyldningsfarve:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "St&andard farve"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Linjebredde:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "S&tandardbredde"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Brug udfyldningsfarve"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Placér alle de klasser du ønsker at generere kode\n"
-"for i listen i højre side"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Tilføj klasse for kode-generering"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Aktivér fortryd"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Valgte klasser"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Diagrammer i faneblade"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Fjern klasse fra kodegenerering"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Anvend nye C++/Java/Ruby-generatorer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Tilgængelige klasser"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Brug angulære associationslinjer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Kodegenereringsstatus"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Autogemning"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Tryk på knappen Generér for at starte kodegenereringen"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "A&ktivér autogemning"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Genereringsstatus"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Vælg autogemningens tidsinterval (minutter):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kode-viser"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Sæt auto-gem endelse:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Vis skjulte blokke"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Filen som gemmes automatisk vil blive gemt som ~/autosave.xmi hvis "
+"den gemmes automatisk inden du har gemt filen manuelt.</p><p>Hvis du "
+"allerede har gemt den, opbevares filen som gemmes automatisk i samme mappe "
+"som filen og får samme navn som filen, fulgt af angivet suffiks.</p><p>Hvis "
+"suffikset er det samme som filen du har gemt, fører dette til at din fil "
+"skrives over af filen som gemmes automatisk.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">komponentnavn her</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Opstart"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Vis bloktype"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Opstartslogo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Farver"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Dagens vink"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Skrifttype:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Indlæs sidste projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papir:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Start nyt projekt med:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Valgt:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Intet diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML Objekt-blok</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klassediagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skjult blok</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Brugsmønster-diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Ikke-redigérbar tekst:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sekvensdiagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Redigérbar tekst:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Samarbejdsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagramegenskaber"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Tilstandsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Navn:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Aktivitetsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Forstør:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponentdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Udførelsesdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klasseopsætning"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Vis s&ynlighed"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Vis attributter"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Vis operationer"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Vis stereot&ype"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Vis attributunderskrift"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Vis pakke"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Vis operationsunderskrift"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Vis &gitter"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Starter scope"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Hæng &på gitteret"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Standardattribut-scope:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Snap komponentstørrelse"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Standardoperation-scope:"
 
-#. 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."
-msgstr ""
-"Snap størrelsen af komponenterne til at være et multiplum af "
-"gittermellemrummet.\n"
-"Hvis 'Snap til gitter' er aktiveret vil en komponent altid være justeret til "
-"gitteret på alle 4 sider."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kodegenerering"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Gittermellemrum:"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Opsætning af kodegenerering"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Opsætning af kodeviser"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Starttilstand"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Linjebredde:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Sluttilstand"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Eksportér alle visninger"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tilstandstype:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Mappe at gemme diagrammer i:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Tilstandsnavn:"
 
-#. 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"
-msgstr "Basismappen som bruges til at gemme billederne"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Kontrolfarve"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Billedtype:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attributegenskaber"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Formatet som billederne vil blive eksporteret til"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Klassifikator &scope (\"statisk\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Brug &mapper"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Offentlig"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Opret samme træstruktur som bruges i dokumentet til at\n"
-"opbevare visningerne i målmappen"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Beskyttet"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementation"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Du har indgivet et ugyldigt attributnavn."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attributnavn ugyldigt"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Visningerna opbevares i mapper i dokumentet. Samme træstruktur som bruges i "
-"dokumentet til at opbevare visningerne kan laves i den valgte basismappe med "
-"dette tilvalg.\n"
-"Kun mapper som er lavet af brugeren laves i basismappen (logisk visning, "
-"brugstilfældevisning med flere, laves ikke)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Attributnavnet du valgte bruges allerede i denne operation."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Rolle-egenskaber"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attributnavn ikke entydigt"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rollenavn:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Egenskaber for entitetsattributter"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicitet:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Standardværdi:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Rolle ændringsmulighed"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Længde/Værdier:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Tilføj kun"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Autoforøg"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Frosset"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Tillad &null"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Ændringsmulig"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributter:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Rolle synlighed"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksering"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementation"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Ingen"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Velkommen til Umbrello.</p>\n"
-"<p>UML-diagrammer lader dig designe og dokumentere objektorienteret software.<a "
-"href=\"help:/umbrello\">Umbrello håndbogen</a> er en god introduktion til "
-"UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primær"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Velkommen til Umbrello 1.5. Nyt i denne version er associationsklasser, Ruby "
-"kodegenerering, mapper som kan gøres eksterne, mulighed for at ændre "
-"grænseflade til klasser, med mere.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Diagrammer med faneblade og mapper som er gjort eksterne er gensidigt "
-"udelukkende. Hvis du har brug for mapper som er gjort eksterne afmarkeres "
-"&quot;Brug diagrammer med faneblade&quot; i Generel opsætning.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unik"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>De fleste diagrampunkter kan ikke ændre størrelse, de ændrer selv størrelse "
-"så den passer med indholdet.\n"
-"Bokse, noter og beskeder på sekvensdiagrammer, kan ændres i størrelsen. Klik "
-"blot på dem og træk i den røde firkant.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Du har indtastet et ugyldigt entitetsattributnavn."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Hvis du ønsker at tilføje en allerede eksisterende klasse til et diagram så "
-"træk blot dens indgang fra trævisningen.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Entitetsattributnavn ugyldigt"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Umbrello's nye refactoring-agent tillader dig at flytte operationer mellem "
-"en klasse og dens afledte og basis \n"
-"klasser.\n"
-"Højreklik på en klasse for at åbne refactoring-agenten.</p>\n"
+"Entitetens attributnavn du har angivet, bruges i forvejen i denne operation."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Sekvensdiagram-objekter kan have en destruktorboks og blive tegnet som "
-"aktører.  Dobbeltklik på én for\n"
-"egenskabsdialogen.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Entitetens attributnavn ikke entydigt"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sekvensdiagrambeskeder kan fungere som konstruktører. Klik på objektfeltet "
-"(frem for den vertikale linje) for at gøre den til en kontruktør.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operationsegenskaber"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sekvensdiagrammer understøtter beskeder til sig selv. Klik på den samme "
-"vertikale linje igen for at oprette en autobesked.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstrakt operation"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Hvis, når du indlæser en fremmed fil, der intet sker, forsøg da at gemme "
-"modellen med et andet navn,\n"
-"luk og genindlæs den gemte fil. Normalt fyldes listevisningen så på korrekt "
-"vis.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Forespørgsel (\"konst\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Klip og Kopiér vil også eksportere billedet til et PNG-klippebord som kan "
-"indsættes i KWord\n"
-"og andre programmer.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametre"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Associationer behøver ikke at være lige linjer. Dobbeltklikker du på en, "
-"laves et flytbart punkt.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "&Ny parameter..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Du kan slå autogemning til i 'Indstil Umbrello'-dialogen.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Du har indtastet et ugyldigt parameternavn."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Hvis der er noget du savner i Umbrello så lad os det vide. \n"
-"Tilføj det til fejl-databasen med 'Rapportér fejl' fra hjælpemenuen\n"
-"eller send det til uml-devel's e-mail-liste.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parameternavn ugyldigt"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Du kan slette alle markerede objekter ved at trykke på Del eller "
-"Backspace.</p>\n"
+"Det parameternavn du har valgt\n"
+"bliver allerede brugt i denne operation."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Hvis du har fundet en programfejl i Umbrello, så lad os vide det. \n"
-"Du kan indsende fejlrapporter med 'Rapportér fejl'-værktøjet i hjælpemenuen.</p>"
-"\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameternavn ikke entydigt"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Tryk på Escape-tasten sætter dette værktøj til at være markeringsværktøjet.\n"
-"Backspace springer tilbage til det tidligere brugte værktøj.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Det parameternavn du har valgt bruges allerede i denne operation."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Du har indtastet et ugyldigt operationnavn."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operationnavn ugyldigt"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "En operation med den underskrift findes allerede i %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Vælg et andet navn eller en anden parameterliste."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Rolle-egenskaber"
 
-#: tips.txt:103
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Skabelonegenskaber"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Du har indgivet et ugyldigt skabelonnavn."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Skabelonnavn ugyldigt"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Du kan markere alle objekter ved at trykke på Ctrl-A.</p>\n"
+"Det skabelonparameternavn du har valgt bruges allerede i denne operation."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Skabelonnavn ikke entydigt"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Klassevisningsvalgmuligheder"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagramfarver"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Navnet du har indtastet er ugyldigt."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Navnet du har indtastet er ikke entydigt."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Navn ikke entydigt"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linje:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Ud&fyld:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "S&tandard"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Brug udfyldning"
 
-#: tips.txt:108
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Eksporterer alle visninger..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Et antal fejl opstod ved eksport af billederne:"
+
+#: 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 "Der var et problem med gemning af filen: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Fejl ved at gemme"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML Modellerer"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Fil at transformere"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "XSLT-fil at bruge"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Du kan oprette og indstille en ny  klasse ved brug af 'Ny klasse'-guiden i "
-"kode-menuen.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML "
+"Modellerersforfatter"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML Modellers forfattere"
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Navn"
+
+#: 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 "Indtast navn:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Indtast operations navn:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Indtast ny tekst:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "FEJL"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Ændr tekst"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Mappefilen %1 eksisterer ikke."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Indlæsningsfejl"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Mappefilen %1 kan ikke åbnes."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1698,6 +1821,10 @@ msgstr "Ny operation..."
 msgid "Select Operation..."
 msgstr "Vælg operation..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Ændr tekst..."
@@ -1749,6 +1876,19 @@ msgstr "Ny"
 msgid "Rename..."
 msgstr "Omdøb..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Indsætningsfejl"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Linjefarve..."
@@ -1777,14 +1917,26 @@ msgstr "Gør mappe intern"
 msgid "Import Classes..."
 msgstr "Importér klasser..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pakke"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Undersystem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artifakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponentdiagram..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Knude"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Udførselsdiagram..."
@@ -1793,10 +1945,18 @@ msgstr "Udførselsdiagram..."
 msgid "Folder"
 msgstr "Mappe"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entitet"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "E/R-diagram..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktør"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Brugsmønster-diagram..."
@@ -1833,6 +1993,18 @@ msgstr "Ny entitetsattribut..."
 msgid "Export as Picture..."
 msgstr "Eksportér som billede..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Grænseflade"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datatype"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enum"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klassediagram..."
@@ -1853,26 +2025,10 @@ msgstr "Sekvensdiagram..."
 msgid "Collaboration Diagram..."
 msgstr "Samarbejdsdiagram..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attributter"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operationer"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Kun offentlig"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Synlighed"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operationsunderskrift"
@@ -1885,11 +2041,6 @@ msgstr "Attributunderskrift"
 msgid "Stereotype"
 msgstr "Stereotype"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Vis"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribut..."
@@ -1914,14 +2065,6 @@ msgstr "Udfyldningsfarve..."
 msgid "Use Fill Color"
 msgstr "Brug udfyldningsfarve"
 
-#: 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 "Farve"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktør..."
@@ -1950,10 +2093,26 @@ msgstr "Enumerér..."
 msgid "Package..."
 msgstr "Pakke..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Initial tilstand"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Sluttilstand"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Tilstand..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Initial aktivitet"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Afslut aktivitet"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Undersystem..."
@@ -1998,6 +2157,14 @@ msgstr "Slet anker"
 msgid "Change Association Name..."
 msgstr "Ændr associationsnavn..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Ryd diagram"
@@ -2032,8 +2199,8 @@ msgstr "filens mappe"
 
 #: 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 ""
 "behold træstrukturen som bruges til at opbevare visningerne i dokumentet i "
 "målmappen"
@@ -2042,191 +2209,95 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller forfattere"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Forkert brug af associationer."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Associationsfejl"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Mappefilen %1 eksisterer ikke."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Mappefilen %1 kan ikke åbnes."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Erik Kjær Pedersen"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "erik@binghamton.edu"
-
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Klar."
-
-#: 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 ""
-"Hold Shift- eller Ctrl-tasten nede for at flytte langs X-aksen. Hold Shift- og "
-"Ctrl-tasten nede for at flytte langs Y-aksen. Et klik med højre museknap "
-"afbryder forflytningen."
-
-#: 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 ""
-"Hold Shift- eller Ctrl-tasten nede for at flytte langs X-aksen. Hold Shift- og "
-"Ctrl-tasten nede for at flytte langs Y-aksen. Et klik med højre museknap "
-"afbryder størrelsesændringen."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Er virkefeltet %1 et navnerum eller en klasse?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ import beder om din hjælp"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Navnerum"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importerer fil: %1 Fremgang: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Intern fejl"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntaksfejl inden '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Tolkningsfejl inden '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "new_actor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "forventet udtryk"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "new_usecase"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Syntaksfejl i deklaration"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "new_package"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} forventet"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "new_component"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "forventet navnerum"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "new_node"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ forventet"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "new_artifact"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Forventede navn på navnerum"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "new_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "En typespecifikation at deklarere kræves"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "new_datatype"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "forventede en deklaration"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "new_enum"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Forventede konstantudtryk"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "new_entity"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' forventet"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "ny_mappe"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} mangler"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "new_association"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Forventede initiering af medlem"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "new_object"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Basal klassespecifikator forventet"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Forventede initieringsklausul"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Tom"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Forventede identifikator"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Misdannet argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Forventede typeidentifikator"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Ukendt argumenttype"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Forventede klassenavn"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Ugyldigt metodenavn"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "forventede betingelse"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Ukendt returtype"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "forventede sætning"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Uspecificeret fejl"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "forventede initiering af for"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Dette er et reserveret nøgleord for sproget i den indstillede kodegenerator."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "forventede catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserveret nøgleord"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2240,106 +2311,66 @@ msgstr "Indtast objektnavn:"
 msgid "new_parameter"
 msgstr "new_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Generelle indstillinger"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Package er et navnerum"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuelle destruktører"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generér tomme konstruktører"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generér adgangsmetoder"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operationer er indlejrede"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Accessors er indlejrede"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Accessors er offentlige"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 side %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Indtast diagramnavn"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Tilføj basisklasse"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Indtast diagrammets nye navn:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Tilføj afledt klasse"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Du er ved at slette hele diagrammet.\n"
-"Er du sikker?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Tilføj operation"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Slet diagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Tilføj attribut"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Omdøbning annulleret"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Tilføj basal grænseflade"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Omdøbning af elementer af listevisningstypen %1, er endnu ikke implementeret."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Tilføj afledt grænseflade"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funktion ikke implementeret"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Basal klassifikator"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Navnet du indtastede var ugyldigt.\n"
-"Omdøbningsprocessen er blevet annulleret."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Afledte klassifikatorer"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "new_association"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Indtast tilstandsnavn"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "new_attribute"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Indtast navnet på den nye tilstand:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "new_template"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Indtast aktivitet"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "new_operation"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Forkert brug af associationer."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "new_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Associationsfejl"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "new_field"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "ny tilstand"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2493,11 +2524,6 @@ msgstr "&Eksportér som billede..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Eksportér &alle diagrammer som billeder..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Egenskaber"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Forstørrelsesskyder"
@@ -2582,21 +2608,28 @@ msgstr "&Dokumentation"
 msgid "Opening file..."
 msgstr "Åbner fil..."
 
+#: 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 "Opretter nyt dokument..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2*.mdl|Alle understøttede filer (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2,*.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2*.mdl|Alle understøttede filer (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2,*.mdl)\n"
 "*.xmi|Ukomprimerede  XMI Filer (*.xmi)\n"
 "*.xmi.tgz|Gzip Komprimerede XMI Filer (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 Komprimerede XMI Filer (*.xmi.tar.bz2)\n"
@@ -2626,6 +2659,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 Komprimeret XMI Fil\n"
 "*|Alle filer"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2634,6 +2671,10 @@ msgstr ""
 "Filen %1 findes.\n"
 "Ønsker du at overskrive den?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Overskriv"
@@ -2669,11 +2710,11 @@ msgstr "Indsætter klippebordets indhold..."
 
 #: 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 ""
-"Umbrello kunne ikke indsætte klippebordets indhold. Objekterne i klipbordet er "
-"måske af forkert type til at blive indsat her."
+"Umbrello kunne ikke indsætte klippebordets indhold. Objekterne i klipbordet "
+"er måske af forkert type til at blive indsat her."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2727,1262 +2768,1319 @@ msgstr "Alle filer"
 msgid "Select Code to Import"
 msgstr "Vælg kode at importere"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Klassenavn:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Aktørnavn:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "new_attribute"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Pakkenavn:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Brugsmønster-&navn:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "new_operation"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Grænseflade&navn:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "new_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponent&navn:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "new_field"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Navn på overlevning:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-model"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Enumererings&navn:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logisk visning"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datatype&navn:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Brugsmønster-visning"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entitets&navn:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponent-visning"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotypenavn:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Udførelsesvisning"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Pakkenavn:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "E/R-model "
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstrakt klasse"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datatyper"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstrakt brugertilfælde"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Den nuværende fil er ændret!\n"
+"Vil du gemme den?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Kørbar"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Filen %1 eksisterer ikke."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Tegn som"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Filen %1 ser ud til at være beskadiget."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Standard"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Der var ingen XMI fil i den komprimerede fil %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Bibliotek"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Der var et problem med at indlæse den udpakkede fil: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabel"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Der var et problem med indlæsning af filen: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Offentlig"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Der var et problem med at uploade filen: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivat"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "brugsmønster-diagram"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&Beskyttet"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klassediagram"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentation"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sekvensdiagram"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klassenavn:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "samarbejdsdiagram"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instans-navn:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "tilstandsdiagram"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Tegn som aktør"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "aktivitetsdiagram"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Flere instanser"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponentdiagram"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Vis dekonstruktion"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "udførselsdiagram"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponentnavn:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "E/R-diagram"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Knudenavn:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Det er et ugyldigt navn for et diagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotypenavn:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Der er allerede et diagram der bruger det navn."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Navnet du valgte\n"
-"er allerede i brug.\n"
-"Navnet er blevet nulstillet."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Navnet er ikke entydigt"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linje:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Ud&fyld:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "S&tandard"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Brug udfyldning"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Ny aktivitet..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Omdøb"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Ny aktivitet"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Omdøb aktivitet"
+"Navnet du indtastede er ikke entydigt.\n"
+"Er dette hvad du ønskede?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Indtast det nye navn på aktiviteten:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Brug navn"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Associationsegenskaber"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Indtast nyt navn"
 
-#: 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 "Generel opsætning"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Er du sikker på at du ønsker at slette diagram %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roller"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Slet diagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rolleopsætning"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Sætter dokumentet op..."
 
-#: 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 "Skrifttypeopsætning"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Opløser objektreferencer..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Associationsskrifttype"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Indlæser UML-elementer..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Skabelonegenskaber"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Indlæser diagrammer..."
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Generelle egenskaber"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autogem%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Type:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Gør mappe ekstern"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Navn:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Indtast modelnavn"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Du har indgivet et ugyldigt skabelonnavn."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Indtast modellens nye navn:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Skabelonnavn ugyldigt"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Visninger"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"Det skabelonparameternavn du har valgt bruges allerede i denne operation."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Skabelonnavn ikke entydigt"
+"Navnet du indtastede var ugyldigt.\n"
+"Oprettelsesprocessen er blevet annulleret"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Egenskaber for entitetsattributter"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Navn ikke gyldigt"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Standardværdi:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Navnet du indtastede var ikke entydigt!\n"
+"Oprettelsesprocessen er blevet annulleret"
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Længde/Værdier:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Oprettelse annulleret"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Autoforøg"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Indlæser listevisning..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Tillad &null"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Mappen skal være tom før den kan slettes."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributter:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Mappen er ikke tom"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksering"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Omdøbning annulleret"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Ingen"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Omdøbning af elementer af listevisningstypen %1, er endnu ikke implementeret."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primær"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funktion ikke implementeret"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Navnet du indtastede var ugyldigt.\n"
+"Omdøbningsprocessen er blevet annulleret."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unik"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 side %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Du har indtastet et ugyldigt entitetsattributnavn."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Indtast diagramnavn"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Entitetsattributnavn ugyldigt"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Indtast diagrammets nye navn:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Entitetens attributnavn du har angivet, bruges i forvejen i denne operation."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Entitetens attributnavn ikke entydigt"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Vis"
+"Du er ved at slette hele diagrammet.\n"
+"Er du sikker?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Klassevisningsvalgmuligheder"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Slet diagram?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagramfarver"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Eksporterer visning..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Navnet du har indtastet er ugyldigt."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "En fejl opstod under eksport af billedet:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Navnet du har indtastet er ikke entydigt."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Den valgte fil %1 eksisterer.\n"
+"Ønsker du at overskrive den?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Filen eksisterer allerede"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello's opsætning"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Kan ikke oprette mappe: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Brugergrænseflade"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Kan ikke gemme et tomt diagram"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Opsætning af brugergrænseflade"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Et problem opstod mens diagrammet blev gemt i %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Linjefarve:"
+#: 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 ""
+"Hold Shift- eller Ctrl-tasten nede for at flytte langs X-aksen. Hold Shift- "
+"og Ctrl-tasten nede for at flytte langs Y-aksen. Et klik med højre museknap "
+"afbryder forflytningen."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "S&tandard farve"
+#: 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 ""
+"Hold Shift- eller Ctrl-tasten nede for at flytte langs X-aksen. Hold Shift- "
+"og Ctrl-tasten nede for at flytte langs Y-aksen. Et klik med højre museknap "
+"afbryder størrelsesændringen."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Udfyldningsfarve:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "St&andard farve"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synkron besked"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Linjebredde:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynkron besked"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "S&tandardbredde"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etiket"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Brug udfyldningsfarve"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Note"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Aktivér fortryd"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Boks"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Diagrammer i faneblade"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Forhold"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Anvend nye C++/Java/Ruby-generatorer"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Retnings-association"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Brug angulære associationslinjer"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementerer (Generalisering/Realisering)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Autogemning"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Lang historik"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "A&ktivér autogemning"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Kort historik"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Vælg autogemningens tidsinterval (minutter):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Sammenføj"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Sæt auto-gem endelse:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Opsplit"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Filen som gemmes automatisk vil blive gemt som ~/autosave.xmi hvis den "
-"gemmes automatisk inden du har gemt filen manuelt.</p>"
-"<p>Hvis du allerede har gemt den, opbevares filen som gemmes automatisk i samme "
-"mappe som filen og får samme navn som filen, fulgt af angivet suffiks.</p>"
-"<p>Hvis suffikset er det samme som filen du har gemt, fører dette til at din "
-"fil skrives over af filen som gemmes automatisk.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Kryds"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Opstart"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Valg"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Opstartslogo"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Aktivitetsovergang"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Dagens vink"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Besked"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Indlæs sidste projekt"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "UDEFINERET"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Start nyt projekt med:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Markér"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Intet diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Klassediagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Brugsmønster-diagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sekvensdiagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Samarbejdsdiagram"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Vis operationer"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Tilstandsdiagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Aktivitetsdiagram"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Ryd diagram"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponentdiagram"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Udførelsesdiagram"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalisering"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klasseopsætning"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Vis s&ynlighed"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Vis attributter"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Associationsnavn"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Vis operationer"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Vis stereot&ype"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Vis attributunderskrift"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Vis pakke"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Standard"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Starter scope"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Standardattribut-scope:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Skråstreg-Skråstreg (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Standardoperation-scope:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Skråstreg-stjerne (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kodegenerering"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Opsætning af kodegenerering"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ Kodegenerering</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Opsætning af kodeviser"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Metode-krop generering"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operationsegenskaber"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Brug følgende klasser i genereret kode:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstrakt operation"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Klassifikator &scope (\"statisk\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Forespørgsel (\"konst\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variabel</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Beskyttet"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementation"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametre"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "streng"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Ny parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Streng</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Du har indtastet et ugyldigt parameternavn."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Liste</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parameternavn ugyldigt"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Det parameternavn du har valgt\n"
-"bliver allerede brugt i denne operation."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameternavn ikke entydigt"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Det parameternavn du har valgt bruges allerede i denne operation."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klassenavn"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Du har indtastet et ugyldigt operationnavn."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Include-filer</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operationnavn ugyldigt"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projekt-generering"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"En operation med den underskrift findes allerede i %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Opretter ANT bygge-dokument"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Vælg et andet navn eller en anden parameterliste."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Auto-Genereringsmetoder"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Rolle A egenskaber"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Tomme konstruktør-metoder"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Rolle B egenskaber"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Associantions-accessor-metoder"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Rolle A synlighed"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Attribut-accessor-metoder"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Rolle B synlighed"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Fra overordnet objekt"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Rolle A ændringsmulighed"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Standardattribut-accessor-scope:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Rolle B ændringsmulighed"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Standard associationsfelt-scope:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Indeholdte punkter"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Fra overordnet rolle"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Note dokumentation"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java-kode generering</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&y attribut..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Nummertegn (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&y operation..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Start-slut (=start  =slut)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Skabeloner"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby kodegenerering</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&y template..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Sprog"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum litteraler"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Mapper"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&y enum litteral..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Skriv alle genererede filer til mappen:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entitetsattributter"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Gen&nemsøg..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&y entitetsattribut..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "G&ennemsøg..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Startaktivitet"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Inkludér header-filer fra mappe:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Slutaktivitet"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Filer genereret af Kode-generator vil blive skrevet til denne mappe"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Aktivitetstype:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Filer i denne mappe vil blive brugt som header-filer i den genererede kode"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Aktivitetsnavn:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Overskrivepolitik"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Kontrolfarver"
+#: 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 ""
+"Hvis en fil med det samme navn som kode-generatoren\n"
+"ønsker at bruge som uddatafil eksisterer allerede:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attributegenskaber"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "O&verskriv"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Begyndelsesværdi:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Overskriv eksisterende filer hvis de er i målmappen"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Offentlig"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "S&pørg"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Du har indgivet et ugyldigt attributnavn."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Hvis en fil med samme navn allerede eksisterer, så spørg hvad der skal gøres"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attributnavn ugyldigt"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Brug et andet navn"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Attributnavnet du valgte bruges allerede i denne operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Hvis en fil allerede eksisterer i målmappen, så vælg et andet navn at bruge "
+"ved at tilføje en endelse til filnavnet"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attributnavn ikke entydigt"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatering"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Vælg operation"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linjer"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sekvensnummer:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Stil for linjeafslutning:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klasseoperation:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Indentation Type:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Brugerindrettet operation:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Indrykningsmængde"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammer"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Dette diagram"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Alle diagrammer"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Ingen indrykning"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Vælg diagrammer"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Faneblad"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Diagramtype"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Mellemrum"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Markering"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Kommentar verbositet"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Samarbejde"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Skriv kommentarer &for afsnit selv om afsnittet \n"
+"er tomt"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvens"
+#: 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 ""
+"Skriver kommentarer for at indikere de forskellige sektioner (offentlig, "
+"privat osv.) i en klasse, selv om sektionerne er tomme"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Anvendelse"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "S&kriv dokumentationskommentarer selv når de er tomme"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Intet diagram valgt."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Skriv kommentarer &for klasse- og metodedokumentation selv om de er tomme"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Billed-indstillinger"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Sprogvalg"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attributopsætning"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Kodegenereringsguide"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operationsopsætning"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Vælg klasser"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Skabelonopsætning"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Placér alle de klasser du ønsker at generere kode\n"
+"for i listen i højre side"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Opsætning af enum litteraler"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Tilføj klasse for kode-generering"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Opsætning af entitetsattributter"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Valgte klasser"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Opsætning af indhold"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Fjern klasse fra kodegenerering"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associationer"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Tilgængelige klasser"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klasseassociation"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Kodegenereringsstatus"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operatio&ner"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Tryk på knappen Generér for at starte kodegenereringen"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Synlighed"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Genereringsstatus"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&perationsunderskrift"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Vis skjulte blokke"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&kke"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">komponentnavn her</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributter"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&ype"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Vis bloktype"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibutunderskrift"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Farver"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Tegn som cirkel"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Skrifttype:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Starttilstand"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papir:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Sluttilstand"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Valgt:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tilstandstype:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML Objekt-blok</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Tilstandsnavn:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skjult blok</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Kontrolfarve"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Ikke-redigérbar tekst:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "new_class"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Redigérbar tekst:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Ny klasse"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagramegenskaber"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klasseattributter"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Forstør:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klasseoperationer"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameteregenskaber"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Vis &gitter"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Overførselsretning"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Hæng &på gitteret"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Snap komponentstørrelse"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"ind\" er en læs kun parameter, \"ud\" er en skriv kun parameter og \"inout\" "
-"er til både at læse og skrive."
+"Snap størrelsen af komponenterne til at være et multiplum af "
+"gittermellemrummet.\n"
+"Hvis 'Snap til gitter' er aktiveret vil en komponent altid være justeret til "
+"gitteret på alle 4 sider."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generér"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Gittermellemrum:"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Afslut"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kode genereret"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ikke genereret"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Linjebredde:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Endnu ikke genereret"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Eksportér alle visninger"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Mappen %1 eksisterer ikke. Ønsker du at oprette den nu?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Mappe at gemme diagrammer i:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Uddata-mappe eksisterer ikke"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Basismappen som bruges til at gemme billederne"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Opret mappe"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Billedtype:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Opret ikke"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Brug &mapper"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Mappen kunne ikke oprettes.\n"
-"Sørg venligst for at du har skriveadgang til dens overmappe eller vælg en "
-"anden, gyldig mappe."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Fejl ved oprettelse af mappe"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Vælg venligst en gyldig mappe"
+"Opret samme træstruktur som bruges i dokumentet til at\n"
+"opbevare visningerne i målmappen"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Uddatamappen eksistere, men er ikke skrivbar.\n"
-"Sæt venligst passende tilladelser eller vælg en anden mappe."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Fejl ved at skrive til uddata-mappe"
+"Visningerna opbevares i mapper i dokumentet. Samme træstruktur som bruges i "
+"dokumentet til at opbevare visningerne kan laves i den valgte basismappe med "
+"dette tilvalg.\n"
+"Kun mapper som er lavet af brugeren laves i basismappen (logisk visning, "
+"brugstilfældevisning med flere, laves ikke)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 synes ikke at være en mappe. Vælg venligst en gyldig mappe."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Rolle ændringsmulighed"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Vælg venligst en gyldig mappe"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Rolle synlighed"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Målfil eksisterer allerede"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Eksportér"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Filen %1 eksisterer allerede i %2.\n"
-"\n"
-"Umbrello kan overskrive filen, generere et lignende\n"
-"filnavn eller ikke generere denne fil."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Anvend på alle tilbageværende filer"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Overskriv"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generér lignende filnavn"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Generér ikke fil"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Ingen tilgængelige tilvalg.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicitet"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Indtast multiplicitet:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Associationsnavn"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Indtast associationsnavn..."
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rollenavn"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Indtast rollenavn:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Indtast operations navn:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Indtast ny tekst:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "FEJL"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Ændr tekst"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Juster til venstre"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Juster til højre"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Justér til top"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Ny"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Justér til bund"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Vis"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Juster vertikal midte"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Forstør:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Juster horisontal midte"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kode"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Justér lodret fordeling"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktivt s&prog"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Justér vandret fordeling"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Du skal vælge mindst 2 objekter, som f.eks. klasser eller aktører for at kunne "
-"justere. Du kan ikke justere associationer."
+"<p>Velkommen til Umbrello.</p>\n"
+"<p>UML-diagrammer lader dig designe og dokumentere objektorienteret software."
+"<a href=\"help:/umbrello\">Umbrello håndbogen</a> er en god introduktion til "
+"UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Dette er et reserveret nøgleord for sproget i den indstillede kodegenerator."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reserveret nøgleord"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Eksporterer visning..."
+"<p>Velkommen til Umbrello 1.5. Nyt i denne version er associationsklasser, "
+"Ruby kodegenerering, mapper som kan gøres eksterne, mulighed for at ændre "
+"grænseflade til klasser, med mere.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"En fejl opstod under eksport af billedet:\n"
+"<p>Diagrammer med faneblade og mapper som er gjort eksterne er gensidigt "
+"udelukkende. Hvis du har brug for mapper som er gjort eksterne afmarkeres "
+"&quot;Brug diagrammer med faneblade&quot; i Generel opsætning.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Den valgte fil %1 eksisterer.\n"
-"Ønsker du at overskrive den?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Filen eksisterer allerede"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "new_actor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "new_usecase"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "new_package"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "new_component"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "new_node"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "new_artifact"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "new_interface"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "new_datatype"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "new_enum"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "new_entity"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "ny_mappe"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "new_object"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Tom"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Misdannet argument"
+"<p>De fleste diagrampunkter kan ikke ændre størrelse, de ændrer selv "
+"størrelse så den passer med indholdet.\n"
+"Bokse, noter og beskeder på sekvensdiagrammer, kan ændres i størrelsen. Klik "
+"blot på dem og træk i den røde firkant.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Ukendt argumenttype"
+#: 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 ""
+"<p>Hvis du ønsker at tilføje en allerede eksisterende klasse til et diagram "
+"så træk blot dens indgang fra trævisningen.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Ugyldigt metodenavn"
+#: 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 ""
+"<p>Umbrello's nye refactoring-agent tillader dig at flytte operationer "
+"mellem en klasse og dens afledte og basis \n"
+"klasser.\n"
+"Højreklik på en klasse for at åbne refactoring-agenten.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Ukendt returtype"
+#: 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 ""
+"<p>Sekvensdiagram-objekter kan have en destruktorboks og blive tegnet som "
+"aktører.  Dobbeltklik på én for\n"
+"egenskabsdialogen.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Uspecificeret fejl"
+#: 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 ""
+"<p>Sekvensdiagrambeskeder kan fungere som konstruktører. Klik på "
+"objektfeltet (frem for den vertikale linje) for at gøre den til en "
+"kontruktør.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Tilføj basisklasse"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Sekvensdiagrammer understøtter beskeder til sig selv. Klik på den samme "
+"vertikale linje igen for at oprette en autobesked.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Tilføj afledt klasse"
+#: 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 ""
+"<p>Hvis, når du indlæser en fremmed fil, der intet sker, forsøg da at gemme "
+"modellen med et andet navn,\n"
+"luk og genindlæs den gemte fil. Normalt fyldes listevisningen så på korrekt "
+"vis.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Tilføj 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 ""
+"<p>Klip og Kopiér vil også eksportere billedet til et PNG-klippebord som kan "
+"indsættes i KWord\n"
+"og andre programmer.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Tilføj attribut"
+#: 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 ""
+"<p>Associationer behøver ikke at være lige linjer. Dobbeltklikker du på en, "
+"laves et flytbart punkt.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Tilføj basal grænseflade"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>Du kan slå autogemning til i 'Indstil Umbrello'-dialogen.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Tilføj afledt grænseflade"
+#: 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 ""
+"<p>Hvis der er noget du savner i Umbrello så lad os det vide. \n"
+"Tilføj det til fejl-databasen med 'Rapportér fejl' fra hjælpemenuen\n"
+"eller send det til uml-devel's e-mail-liste.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Basal klassifikator"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Du kan slette alle markerede objekter ved at trykke på Del eller "
+"Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Afledte klassifikatorer"
+#: 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 ""
+"<p>Hvis du har fundet en programfejl i Umbrello, så lad os vide det. \n"
+"Du kan indsende fejlrapporter med 'Rapportér fejl'-værktøjet i hjælpemenuen."
+"</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Kan ikke oprette mappe: %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 ""
+"<p>Tryk på Escape-tasten sætter dette værktøj til at være "
+"markeringsværktøjet.\n"
+"Backspace springer tilbage til det tidligere brugte værktøj.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Kan ikke gemme et tomt diagram"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Du kan markere alle objekter ved at trykke på Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Et problem opstod mens diagrammet blev gemt i %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 ""
+"<p>Du kan oprette og indstille en ny  klasse ved brug af 'Ny klasse'-guiden "
+"i kode-menuen.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "new_stereotype"
diff --git a/tde-i18n-de/messages/tdesdk/umbrello.po b/tde-i18n-de/messages/tdesdk/umbrello.po
index 8a553f25323..c052208de1d 100644
--- a/tde-i18n-de/messages/tdesdk/umbrello.po
+++ b/tde-i18n-de/messages/tdesdk/umbrello.po
@@ -20,7 +20,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-05-13 22:04+0200\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -31,245 +31,205 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML-Modeller eigenständiger Code-Erzeuger"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Die umzuwandelnde Datei"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Die zu verwendende XSLT-Datei"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello "
-"UML-Modeller-Autoren"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML-Modeller-Autoren"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Sebastian Stein"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Alle Ansichten werden exportiert ..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "seb.stein@hpfsc.de"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Beim Exportieren der Bilder sind Fehler aufgetreten:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Namen der Aktivität eingeben"
 
-#: 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 "Beim Speichern der Datei %1 ist ein Fehler aufgetreten."
+#: 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 "Geben Sie den Namen der neuen Aktivität ein:"
 
-#: 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 "Fehler beim Speichern."
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Links ausrichten"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Rechts ausrichten"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synchrone Nachricht"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Oben ausrichten"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynchrone Nachricht"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Unten ausrichten"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Assoziation"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Vertikal mittig ausrichten"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Containment (Untergeordnete Elemente)"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Horizontal mittig ausrichten"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Verbindung"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Vertikal verteilt ausrichten"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Textzeile"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Horizontal verteilt ausrichten"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Notiz"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Zum Ausrichten müssen mindestens 2 Objekte wie Klassen und Akteure "
+"ausgewählt sein. Assoziationen können nicht ausgerichtet werden."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Rahmen"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatierung"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Akteur"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Abhängigkeit"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Verallgemeinerung"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregation"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Beziehung"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Gerichtete Assoziation"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementiert (Verallgemeinerung/Realisierung)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Komposition"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Anwendungsfall"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Klasse"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Anfangszustand"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Endzustand"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Verzweigung/Zusammenführung"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Fork/Join"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponente"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Knoten"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Abhängigkeit"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Assoziation"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Schnittstelle"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Selbstassoziation"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datentyp"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Kollaborationsnachricht"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Aufzählung"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sequenznachricht"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entität"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Kollaborationseigennachricht"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Tiefe Historie"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sequenzeigennachricht"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Flache Historie"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Containment (Untergeordnete Elemente)"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Vereinigung"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Komposition"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Verzweigung"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisierung"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Abzweigung"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Allgemeine Assoziation"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Auswahl"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Verbindung"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Zustandsübergang"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Aktivitätsübergang"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktivität"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Zustand"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplizität"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Endaktivität"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Multiplizität eingeben:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Anfangsaktivität"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Assoziationenname"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Nachricht"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Assoziations-Name eingeben:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "UNDEFINIERT"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rollenname"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Auswahl"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Rollen-Name eingeben:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Eine Operation mit dieser Signatur existiert bereits und kann nicht nochmal "
+"hinzugefügt werden."
+
+#: 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 "Das ist ein ungültiger Name."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Ungültiger Name"
+
+#: 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 "Der Name wird bereits genutzt."
+
+#: 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 "Das ist kein eindeutiger Name."
 
 #: clipboard/umlclipboard.cpp:687
 msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
+"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 ""
 "Mindestens ein Objekt kann nicht aus der Zwischenablage eingefügt werden, da "
 "bereits ein Objekt mit dem gleichen Namen existiert. Alle anderen Objekte "
@@ -284,18 +244,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Die Datei %1 lässt sich nicht zum Schreiben öffnen. Bitte stellen Sie sicher, "
-"dass der Ordner existiert und Sie Schreibrechte besitzen."
+"Die Datei %1 lässt sich nicht zum Schreiben öffnen. Bitte stellen Sie "
+"sicher, dass der Ordner existiert und Sie Schreibrechte besitzen."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Die Datei kann nicht geöffnet werden."
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Der Ordner kann nicht angelegt werden:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Der Ordner kann nicht angelegt werden:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -309,1364 +267,1527 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Der Ordner kann nicht angelegt werden."
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Zustandsname eingeben"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Allgemeine Einstellungen"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Geben Sie den Namen des neuen Zustandes ein:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paket als Namensraum"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Aktivität eingeben"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuelle Destruktoren"
 
-#: 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 "Geben Sie den Namen der neuen Aktivität ein:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Leere Konstruktoren erzeugen"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "Neue Aktivität"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Zugriffsfunktionen erzeugen"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-Modell"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operationen sind inline"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logische Ansicht"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Zugriffsfunktionen sind inline"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Anwendungsfallansicht"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Zugriffsfunktionen sind public"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentenansicht"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Datei wird importiert: %1 Fortschritt: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Verteilungsansicht"
+#: 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 "Fertig."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entity-Relationship-Modell"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Ist %1 ein Namensraum oder eine Klasse?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datentypen"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++-Import benötigt Ihre Hilfe"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Die aktuelle Datei wurde verändert.\n"
-"Wollen Sie die Datei jetzt speichern?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Namensraum"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Die Datei %1 existiert nicht."
+#: 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 "Klasse"
 
-#: 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 "Fehler beim Laden."
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Interner Fehler"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Die Datei %1 scheint beschädigt zu sein."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntaxfehler vor '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Es konnte keine XMI-Datei in der gepackten Datei %1 gefunden werden."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Parserfehler vor '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Beim Laden der entpackten Datei %1 ist ein Fehler aufgetreten."
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Beim Laden der Datei %1 ist ein Fehler aufgetreten."
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "Ausdruck (Expression) erwartet"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Beim Hochladen der Datei %1 ist ein Fehler aufgetreten."
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Deklarations-Syntax-Fehler"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "Anwendungsfalldiagramm"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} erwartet"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Klassendiagramm"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "Namensraum (Namespace) erwartet"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "Sequenzdiagramm"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ erwartet"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "Kollaborationsdiagramm"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Name für Namensraum erwartet"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "Zustandsdiagramm"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Typspezifizierer zum Deklarieren benötigt"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "Aktivitätsdiagramm"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "Deklaration erwartet"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "Komponenten-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Konstanter Audruck erwartet"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "Verteilungsdiagramm"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' erwartet"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "Entity-Relationship-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} fehlt"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Name"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Initialisierung von Member erwartet"
 
-#: 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 "Namen eingeben:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Basisklassen-Klassifizierer erwartet"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Das ist ein ungültiger Name für ein Diagramm."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Initialisierungsausdruck erwartet"
 
-#: 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 "Ungültiger Name"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identifizierer erwartet"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Es existiert bereits ein Diagramm mit diesem Namen."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Typ-ID erwartet"
 
-#: 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 "Das ist kein eindeutiger Name."
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Klassenname erwartet"
 
-#: 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 "Das ist ein ungültiger Name."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "Bedingung erwartet"
 
-#: 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 "Der Name wird bereits genutzt."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "Anweisung erwartet"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Der eingegebene Name ist nicht eindeutig!\n"
-"Ist dies beabsichtigt?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for-Initialisierung erwartet"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nicht eindeutiger Name"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch erwartet"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Namen beibehalten"
+#: 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 "Ei&genschaften"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Neuen Namen eingeben"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Anfangsaktivität"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Sind Sie sicher, dass Sie das Diagramm %1 löschen wollen?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Endaktivität"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Diagramm löschen"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Verzweigung/Zusammenführung"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Dokument wird vorbereitet ..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Fork/Join"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Objektreferenzen werden aufgelöst ..."
+#: 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 "Allgemein"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML-Elemente werden geladen ..."
+#: 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 "Allgemeine Eigenschaften"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Diagramme werden geladen ..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Aktivitätstyp:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "TDE-UML-Diagramm"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Aktivitätsname:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autospeichern%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 "Dokumentation"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Ordner auslagern"
+#: 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 "Schrift:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Modellnamen eingeben"
+#: 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 "Schrift-Einstellungen"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Geben Sie den neuen Namen des Modells ein:"
+#: 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 "Farbe"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Ansichten"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Objektfarben"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Der von Ihnen eingegebene Name ist ungültig.\n"
-"Der Erstellungsvorgang wurde abgebrochen."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivitäten"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Der Name ist ungültig."
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Neue Aktivität ..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Der eingegebene Name ist nicht eindeutig.\n"
-"Der Erstellungsprozess wurde abgebrochen."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Verbindung löschen"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Erstellungsprozess abgebrochen"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Umbenennen"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Listendarstellung wird geladen ..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Neue Aktivität"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Der Ordner muss leer sein bevor er gelöscht werden kann."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "Neue Aktivität"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Der Ordner ist nicht leer."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Aktivität umbenennen"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Eine Operation mit dieser Signatur existiert bereits und kann nicht nochmal "
-"hinzugefügt werden."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Geben Sie den neuen Namen der Aktivität ein:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Namen der Aktivität eingeben"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "neuer_zustand"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Typ:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Verallgemeinerung"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Assoziationen"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Selbstassoziation"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Assoziationseigenschaften"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Kollaborationsnachricht"
+#: 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 "Allgemeine Einstellungen"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sequenznachricht"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Rollen"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Kollaborationseigennachricht"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rollen-Einstellungen"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sequenzeigennachricht"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Schrift für Assoziation"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisierung"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Eigenschaften von Rolle A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Allgemeine Assoziation"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Eigenschaften von Rolle B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportieren"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Sichtbarkeit von Rolle A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "Dia&gramm"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Sichtbarkeit von Rolle B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Neu"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Änderbarkeit von Rolle A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Anzeigen"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Änderbarkeit von Rolle B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Quelltext"
+msgid "Rolename:"
+msgstr "Rollenname:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Aktive Sprache"
+msgid "Multiplicity:"
+msgstr "Multiplizität:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentation"
+msgid "Public"
+msgstr "Public"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Strich-Strich (//)"
+msgid "Private"
+msgstr "Private"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Strich-Stern (/**  */)"
+msgid "Protected"
+msgstr "Protected"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+msgid "Implementation"
+msgstr "Implementierung"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++-Quelltextgenerierung</p>"
+msgid "Changeable"
+msgstr "Änderbar"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Allgemein"
+msgid "Frozen"
+msgstr "Eingefroren"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Quelltextgenerierung für Methode"
+msgid "Add only"
+msgstr "Nur hinzufügen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Folgende für Klassen in generiertem Quelltext verwenden:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Klassenname:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Akteur&name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Paketname:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Anwendungsfall&name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Schnittstellen&name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponenten&name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artefakt&name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Zeichenfolge</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Name &Aufzählung:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Liste</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datentyp&name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Name &Entität:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Stereot&ypname:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Paketname:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klassenname"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Ab&strakte Klasse"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\"><b>Includes</b></p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Ab&strakter Anwendungsfall"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projekterstellung"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Ausführbar"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "ANT-Projekt erstellen"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Zeichnen als"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Automatisch erzeugte Funktionen"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Standard"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Leere Konstruktoren"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Füllfarbe:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Zugriffsfunktion für Assoziation"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "B&ibliothek"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Zugriffsfunktion für Attribute"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "T&abelle"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Sichtbarkeit"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Private"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublic"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivate"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Vom Elternobjekt"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Standard-Attribut-Sichtbarkeit:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "I&mplementierung"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Standard-Assoziationsfeld-Umfang:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klassenname:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Von Elternrolle"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instanzname:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java-Quelltextgenerierung</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Als Akteur zeichnen"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hash (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Mehrfache Instanz"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Beginn-Ende (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Dekonstruktion anzeigen"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby-Quelltextgenerierung</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponentenname:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Knotenname:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotypname:"
+
+#: 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 ""
+"Der von Ihnen gewählte Name ist bereits vergeben.\n"
+"Der Name wurde zurückgesetzt."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Der Name ist nicht eindeutig."
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attribute"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Neues &Attribut ..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operationen"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Neue O&peration ..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Klassen-Vorlage"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&eue Klassen-Vorlage ..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Aufzählungselement"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&eues Aufzählungselement ..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entitätsattribut"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&eues Entitätsattribut ..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Verbindung löschen"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "Ei&genschaften"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Anzeigen"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operatio&nen"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Sichtbarkeit"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Signatur der O&peration"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ribute"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&yp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Signatur des Attr&ibuts"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Als Kreis zeichnen"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Anzeige"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Anzeigeoptionen"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribut-Einstellungen"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operation-Einstellungen"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Klassen-Vorlage-Einstellungen"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Aufzählungselement-Einstellungen"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Entitätattribut-Einstellungen"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Containment (Untergeordnete Elemente)"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Inhalt-Eigenschaften"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klassenassoziationen"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "neue_klasse"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Neue Klasse"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klassenattribute"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klassenoperationen"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Einstellungen zur Quelltextgenerierung"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Sprache"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Erzeugen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Ordner"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Fertig"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Ordner für generierte Dateien:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Quelltext generiert"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Aus&wählen ..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Nicht erzeugt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Au&swählen ..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Noch nicht erzeugt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Einbeziehen der Header-Dateien aus Ordner:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Der Ordner %1 existiert noch nicht. Soll er jetzt erstellt werden?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"In diesem Ordner werden die durch die Quelltextgenerierung erzeugten Dateien "
-"abgelegt."
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Ausgabeordner existiert nicht"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Ordner erstellen"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Datei nicht erstellen"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Dateien in diesem Ordner werden für die Quelltextgenerierung als Header-Dateien "
-"genutzt."
+"Der Ordner kann nicht angelegt werden.\n"
+"Bitte vergewissern Sie sich, dass Sie Schreibrechte auf den übergeordneten "
+"Ordner besitzen oder wählen Sie einen gültigen Ordner."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Überschreibungs-Regelung"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Fehler beim Anlegen des Ordners"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Bitte wählen Sie einen gültigen Ordner!"
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Wenn bereits eine Datei mit dem gleichen Namen wie von der Quelltextgenerierung "
-"für die Ausgabe vorgesehen existiert:"
+"Der Ausgabeordner existiert, ist aber nicht beschreibbar.\n"
+"Bitte setzen Sie die entsprechenden Rechte oder wählen Sie einen anderen "
+"Ordner!"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Über&schreiben"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Fehler beim Schreiben in den Ausgabeordner"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Dateien überschreiben, wenn sie im Zielordner bereits existieren"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr ""
+"%1 scheint kein Ordner zu sein. Bitte wählen Sie einen gültigen Ordner!"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Nach&fragen"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Bitte einen gültigen Ordner wählen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Existiert bereits eine Datei mit gleichen Namen, dann wird nachgefragt, was zu "
-"tun ist."
+msgid "Code Viewer"
+msgstr "Quelltext-Betrachter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Anderen &Dateinamen verwenden"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Keine Optionen verfügbar.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Wenn im Ausgabeordner bereits eine Datei mit gleichem Namen existiert, wird ein "
-"anderer Name durch Anhängen einer Erweiterung verwendet."
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramme"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatierung"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linien"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "A&ktuelles Diagramm"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Linienende-Stil:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Alle Diagramme"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Quelltexteinrückung:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "Diagramme &wählen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Umfang der Quelltexteinrückung:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "Diagramm&typ"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Auswahl"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Anwendungsfall"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Kollaboration"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sequenz"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Zustand"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Verteilung"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "TDE-UML-Diagramm"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Keine Diagramme ausgewählt."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Das Format, in das die Bilder exportiert werden"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Notizdokumentation"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Die Zieldatei existiert bereits"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Die Datei %1 existiert bereits in %2.\n"
+"\n"
+"Umbrello kann die Datei überschreiben, einen ähnlichen Namen\n"
+"erzeugen oder das Erstellen der Datei abbrechen."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Macintosh (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "Auf alle übrigen Dateien &anwenden"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Keine Quelltexteinrückung"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Über&schreiben"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulator"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "Ähnlichen Dateinamen &generieren"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Leerzeichen"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Datei nicht erstellen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Umfang Quelltextkommentare"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameter-Eigenschaften"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "Erzeugt &Kommentare für Abschnitte, selbst wenn diese leer sind"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Typ:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Name:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Anfangswert:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Übergaberichtung"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Erzeugt Kommentare, um die verschiedenen Abschnitte (public, private usw.) in "
-"einer Klasse zu kennzeichnen, selbst wenn diese leer sind."
+"\"rein\" ist ein nur lesender Parameter, \"raus\" ist ein nur schreibender "
+"Parameter und \"reinraus\" ist ein lesender und schreibender Parameter."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Erzeugt Dokumentations-Kommentare, selbst wenn diese leer sind"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Enthaltene Elemente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Erzeugt Kommentare &für Klassen und Methoden-Dokumentation, selbst wenn diese "
-"leer sind"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Operation auswählen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Spracheinstellungen"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sequenznummer:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Assistent für die Quelltext-Generierung"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klassenoperation:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Klassen auswählen"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Angepasste Operation:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Umbrello einrichten"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Benutzerschnittstelle"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Einstellungen Benutzerschnittstelle"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Linienfarbe:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "S&tandardfarbe"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Füllfarbe:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "&Standardfarbe"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Linienstärke:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "St&andardstärke:"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Elemente füllen"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Platzieren Sie alle Klassen, für die Sie Quelltext erzeugen wollen,\n"
-"in der rechten Liste."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Klasse für Quelltextgenerierung hinzufügen."
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Rückgängig/Wiederherstellen a&ktivieren"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Ausgewählte Klassen"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Unterfenster verwenden"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Klasse von Quelltextgenerierung ausschließen"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Neue C++/Java/Ruby-Quelltextgeneratoren verwenden"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Vorhandene Klassen"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Eckige Assoziationslinien verwenden"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Status Quelltextgenerierung"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatisches Speichern"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Drücken Sie auf Erzeugen, um die Quelltextgenerierung zu starten."
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Automatisches Speichern &aktivieren"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Status der Generierung"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Intervall für automatisches Speichern (in Minuten):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Quelltext-Betrachter"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Dateiendung für automatische Speicherung:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Versteckte Blöcke anzeigen"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Die Datei zum automatischen Speichern wird unter ~/autosave.xmi "
+"abgelegt, wenn die automatische Speicherung vor einer manuellen Speicherung "
+"erfolgt.<qt><p>Wenn Sie bereits manuell gespeichert haben, wird die Datei "
+"zur automatischen Speicherung in dem gleichen Ordner wie die manuell "
+"gespeicherte Datei abgelegt und erhält den gleichen Namen gefolgt von der "
+"angegebenen Endung.</p><p>Wenn die gewählte Dateiendung gleich der Endung "
+"der manuell gespeicherten Datei ist, so wird die Datei automatisch "
+"überschrieben.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">Komponenten-Name hier</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Start"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Blocktyp anzeigen"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Sta&rtbildschirm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Farben"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Tipp des Tages"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Schrift:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Letztes Projekt laden"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papier:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Neues Projekt starten mit:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Ausgewählt:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Kein Diagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML-Objekt-Block:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klassendiagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Versteckter Block:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Anwendungsfalldiagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Nicht änderbarer Text:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sequenzdiagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Änderbarer Text:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Kollaborationsdiagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagramm-Eigenschaften"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Zustandsdiagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Name:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Aktivitätsdiagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zoom:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponenten-Diagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Verteilungsdiagramm"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klassen-Einstellungen"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "&Sichtbarkeit anzeigen"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Attribute anzeigen"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Operationen anzeigen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Stereo&typ anzeigen"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Attributsignatur anzeigen"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Paket anzeigen"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Operationssignatur anzeigen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Raster anzei&gen"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Startsichtbarkeit"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Einrasten am Ras&ter"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Voreingestellte Attribut-Sichtbarkeit:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Komponentengröße anpassen"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Voreingestellte Operations-Sichtbarkeit:"
 
-#. 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."
-msgstr ""
-"Die Größe der Komponenten wird an die Rastergröße angepasst.\n"
-"Ist \"Einrasten am Raster\" ausgewählt, wird eine Komponente immer mit allen 4 "
-"Seiten am Raster ausgerichtet."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Quelltextgenerierung"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Rasterabstand:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Quelltextgenerierungs-Einstellungen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Quelltext-Betrachter-Einstellungen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Anfangszustand"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Linienstärke:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Endzustand"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Alle Ansichten exportieren"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Zustandstyp:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Ordner zum Speichern der Diagramme:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Zustandsname:"
 
-#. 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"
-msgstr "Der Basisordner zum Speichern der Bilder"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Objektfarbe"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Bildtyp:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribut-Eigenschaften"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Das Format, in das die Bilder exportiert werden"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Kla&ssifizierer-Sichtbarkeit (\"statisch\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "&Ordner verwenden"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Erzeugt im Zielordner die gleiche Baumstruktur, die auch zum Speichern der "
-"Ansichten im Dokument verwendet wird."
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&ected"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementierung"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Sie haben einen ungültigen Attributnamen eingegeben."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Der Attributname ist ungültig."
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"Die Ansichten werden im Dokument in Ordner gespeichert. Die gleiche "
-"Baumstruktur, die im Dokument zum Speichern der Ansichten verwendet wird, kann "
-"auch im gewählten Basisordner erzeugt werden.\n"
-"Nur die vom Anwender erstellten Ordner werden auch im Basisordner erstellt (die "
-"logische Ansicht, Anwendungsfallansicht usw. werden nicht erzeugt)."
+"Der von Ihnen gewählte Attributname ist in dieser Operation bereits vergeben."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Eigenschaften der Rolle"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Der Attributname ist nicht eindeutig."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rollenname:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Eigenschaften Entität-Attribut"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplizität:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Standardwert:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Rollen-Änderbarkeit"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Länge/Werte:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Nur hinzufügen"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto-Inkrement"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Eingefroren"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "&Null erlauben"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Änderbar"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attribute:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Rollen-Sichtbarkeit"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indizierung"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementierung"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Keine"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Willkommen zu Umbrello.</p>\n"
-"<p>Mit UML-Diagrammen können Sie objektorientierte Software entwerfen und "
-"dokumentieren. <a href=\"help:/umbrello\">Das Handbuch zu Umbrello</a> "
-"gibt eine gute Einführung in UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primär"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Willkommen zu Umbrello 1.5. Neu in dieser Version sind Assoziationsklassen, "
-"Ruby Quelltextgenerierung, auslagerbare Ordner, die Möglichkeit Schnittstellen "
-"in Klassen umzuwandeln, und vieles mehr.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Die beiden Funktionen Arbeiten mit Unterfenstern und das Auslagern von "
-"Ordnern in eigene Dateien können nicht gleichzeitig genutzt werden. Werden "
-"ausgelagerte Ordner benötigt, muss &quot;Unterfenster verwenden&quot; in den "
-"allgemeinen Einstellungen deaktiviert werden.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unique"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass die meisten Diagrammobjekte nicht in ihrer Größe geändert "
-"werden können? Sie passen ihre Größe automatisch dem Inhalt an. Rahmen, Notizen "
-"und Sequenzdiagrammnachrichten können in ihrer Größe verändert werden, einfach "
-"am roten Rechteck anfassen und ziehen.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Sie haben einen ungültigen Entitätsattributnamen eingegeben."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass Sie eine bereits existierende Klasse zu einem Diagramm "
-"hinzufügen können, indem Sie die Klasse aus der Baumansicht auf das Diagramm "
-"ziehen? </p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Der Entitätsattributname ist ungültig."
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Wussten Sie, dass Sie mit Umbrellos Refactoring-Assistenten Operationen "
-"einer Klasse in die Basisklasse oder abgeleitete Klasse verschieben können?\n"
-"Sie rufen den Refactoring-Assistenten über einen Rechtsklick auf die Klasse "
-"auf.</p>\n"
+"Der von Ihnen gewählte Entitätsattributname ist in dieser Operation bereits "
+"vergeben."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass Objekte in Sequenzdiagrammen eine Box für das Ende der "
-"Lebenszeit des Objektes haben und als Akteure gezeichnet werden können?</p>"
-"<p>Ein Doppelklick ruft den Eigenschaften-Dialog auf.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Der Entitätsattributname ist nicht eindeutig."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass Sequenzdiagrammnachrichten als Konstruktor benutzt werden "
-"können? Klicken Sie dazu auf das Objekt, anstatt auf die vertikale "
-"Lebenslinie.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operation-Eigenschaften"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass Sequenzdiagramme Nachrichten auf sich selbst "
-"unterstützten? Klicken Sie auf die vertikale Lebenslinie erneut, um solch eine "
-"Nachricht zu erstellen.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstrakte Operation"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass wenn nach dem Laden einer fremden Datei nichts in der "
-"Listenansicht angezeigt wird, Sie das Modell unter einem anderen Namen "
-"speichern sollten und erneut laden. In den meisten Fällen ist die "
-"Listendarstellung dann vollständig.</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Query (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass \"Ausschneiden\" und \"Kopieren\" auch ein PNG-Bild in die "
-"Zwischenablage ablegt, das z. B. in KWord oder anderen Anwendungen eingefügt "
-"werden kann?</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parameter"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass Assoziationen nicht immer gerade Linien sein müssen?\n"
-"Durch einen Doppelklick auf eine Assoziation wird ein Punkt erzeugt, der sich "
-"verschieben lässt.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Neuer &Parameter ..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Wussten Sie, dass Sie im Eigenschaften-Dialog die automatische Speicherung "
-"einschalten können?</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Sie haben einen ungültigen Parameternamen eingegeben."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Fehlt eine Funktion in Umbrello? Bitte teilen Sie uns Ihre Idee mit.\n"
-"Entweder berichten Sie Ihre Idee über \"Probleme oder Wünsche berichten ...\" "
-"im Hilfe-Menü an die Fehlerdatenbank oder Sie senden eine E-Mail an die "
-"Mailingliste uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Der Parametername ist ungültig."
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Wussten Sie, dass Sie alle ausgewählten Objekte durch Drücken der Tasten "
-"\"Entf\" oder \"Rückschritt\" löschen können?</p>\n"
+"Der von Ihnen gewählte Parametername\n"
+"ist in dieser Operation bereits vergeben."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Wenn Sie Fehler gefunden haben, melden Sie uns diese bitte. Sie können die "
-"Fehlermeldungen über den Eintrag \"Probleme oder Wünsche berichten ...\" aus "
-"dem Hilfe-Menü an uns weiterleiten.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Der Parametername ist nicht eindeutig."
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Wussten Sie, dass Sie mit der Escape-Taste das Bewegungswerkzeug aus der "
-"Werkzeugleiste auswählen?\n"
-"Mit der Rücktaste springen Sie zurück zum zuletzt benutzten Werkzeug.</p>\n"
+"Der von Ihnen gewählte Parametername ist in dieser Operation bereits "
+"vergeben."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Sie haben einen ungültigen Operationsnamen eingegeben."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Der Operationsname ist ungültig."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Eine Operation mit dieser Signatur existiert bereits in %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Wählen Sie einen anderen Namen oder eine andere Parameterliste."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Eigenschaften der Rolle"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Klassen-Vorlagen-Eigenschaften"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Sie haben einen ungültigen Namen für eine Klassen-Vorlage eingegeben."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Der Name der Klassen-Vorlage ist ungültig."
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Wussten Sie, dass Sie alle Objekte durch Betätigen von Strg-A auswählen "
-"können?</p>\n"
+"Der von Ihnen gewählte Vorlagenparametername ist in dieser Operation bereits "
+"vergeben."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Der Vorlagenparametername ist nicht eindeutig."
 
-#: tips.txt:108
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Klassen-Anzeigeoptionen"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagrammfarben"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Der von Ihnen eingegebene Name ist ungültig."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Der von Ihnen eingegebene Name ist nicht eindeutig."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nicht eindeutiger Name"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linie:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Füllfarbe:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "S&tandard"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Elemente füllen"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Alle Ansichten werden exportiert ..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Beim Exportieren der Bilder sind Fehler aufgetreten:"
+
+#: 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 "Beim Speichern der Datei %1 ist ein Fehler aufgetreten."
+
+#: 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 "Fehler beim Speichern."
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML-Modeller eigenständiger Code-Erzeuger"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Die umzuwandelnde Datei"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Die zu verwendende XSLT-Datei"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Wussten Sie, dass Sie mit Hilfe des Klassenassistenten im Menü \"Quelltext\" "
-"eine neue Klasse erstellen und einrichten können?</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML-Modeller-"
+"Autoren"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML-Modeller-Autoren"
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Name"
+
+#: 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 "Namen eingeben:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Operations-Name eingeben:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Neuen Text eingeben:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "Fehler"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Text ändern"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Die Ordnerdatei %1 existiert nicht."
+
+#: 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 "Fehler beim Laden."
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Die Ordnerdatei %1 scheint beschädigt zu sein."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1720,6 +1841,10 @@ msgstr "Neue Operation ..."
 msgid "Select Operation..."
 msgstr "Operation auswählen ..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Text ändern ..."
@@ -1771,6 +1896,19 @@ msgstr "Neu"
 msgid "Rename..."
 msgstr "Umbenennen ..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Einfügefehler"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Linienfarbe ..."
@@ -1799,14 +1937,26 @@ msgstr "Ordner einbeziehen"
 msgid "Import Classes..."
 msgstr "Klassen importieren ..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Subsystem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponenten-Diagramm ..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Knoten"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Verteilungsdiagramm ..."
@@ -1815,10 +1965,18 @@ msgstr "Verteilungsdiagramm ..."
 msgid "Folder"
 msgstr "Ordner"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entität"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Entity-Relationship-Diagramm ..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Akteur"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Anwendungsfalldiagramm ..."
@@ -1855,6 +2013,18 @@ msgstr "Neues Entitätsattribut ..."
 msgid "Export as Picture..."
 msgstr "Als Bild exportieren ..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Schnittstelle"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datentyp"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Aufzählung"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klassendiagramm ..."
@@ -1875,26 +2045,10 @@ msgstr "Sequenzdiagramm ..."
 msgid "Collaboration Diagram..."
 msgstr "Kollaborationsdiagramm ..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attribute"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operationen"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Nur Public"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Sichtbarkeit"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Signatur der Operation"
@@ -1907,11 +2061,6 @@ msgstr "Signatur des Attributs"
 msgid "Stereotype"
 msgstr "Stereotyp"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Anzeigen"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribut ..."
@@ -1936,14 +2085,6 @@ msgstr "Füllfarbe ..."
 msgid "Use Fill Color"
 msgstr "Elemente füllen"
 
-#: 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 "Farbe"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Akteur ..."
@@ -1972,10 +2113,26 @@ msgstr "Aufzählung ..."
 msgid "Package..."
 msgstr "Paket ..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Anfangszustand"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Endzustand"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Zustand ..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Anfangsaktivität"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Endaktivität"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Subsystem ..."
@@ -2020,6 +2177,14 @@ msgstr "Verbindung löschen"
 msgid "Change Association Name..."
 msgstr "Assoziationennamen ändern ..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Diagramm leeren"
@@ -2055,199 +2220,106 @@ msgstr "der Ordner der Datei"
 
 #: 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 ""
-"die Baumstruktur, die zum Speichern der Ansichten im Dokument verwendet wird, "
-"im Zielordner beibehalten"
+"die Baumstruktur, die zum Speichern der Ansichten im Dokument verwendet "
+"wird, im Zielordner beibehalten"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML-Modeller-Autoren"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Unzulässige Verwendung einer Assoziation."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Assoziationsfehler!"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Die Ordnerdatei %1 existiert nicht."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Die Ordnerdatei %1 scheint beschädigt zu sein."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Sebastian Stein"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "seb.stein@hpfsc.de"
-
-#: 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 "Fertig."
-
-#: 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 ""
-"Halten Sie für eine Bewegung entlang der X-Achse die Umschalt- oder Strg-Taste "
-"gedrückt. Ein Klick mit der rechten Maustaste bricht den Verschiebevorgang ab."
-
-#: 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 ""
-"Halten Sie für eine Bewegung entlang der X-Achse die Umschalt- oder Strg-Taste "
-"gedrückt. Ein Klick mit der rechten Maustaste bricht die Größenänderung ab."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Ist %1 ein Namensraum oder eine Klasse?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++-Import benötigt Ihre Hilfe"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Namensraum"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Datei wird importiert: %1 Fortschritt: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Interner Fehler"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntaxfehler vor '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Parserfehler vor '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "neuer_akteur"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "Ausdruck (Expression) erwartet"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "neuer_anwendungsfall"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Deklarations-Syntax-Fehler"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "neues_paket"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} erwartet"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "neue_komponente"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "Namensraum (Namespace) erwartet"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "neuer_knoten"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ erwartet"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "neues_artefakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Name für Namensraum erwartet"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "neue_schnittstelle"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Typspezifizierer zum Deklarieren benötigt"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "neuer_datentyp"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "Deklaration erwartet"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "neue_aufzaehlung"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Konstanter Audruck erwartet"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "neue_entitaet"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' erwartet"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "neuer_ordner"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} fehlt"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "neue_assoziation"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Initialisierung von Member erwartet"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "neues_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Basisklassen-Klassifizierer erwartet"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Initialisierungsausdruck erwartet"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Leer"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identifizierer erwartet"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Missgebildetes Argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Typ-ID erwartet"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Unbekannter Argumententyp"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Klassenname erwartet"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Unzulässiger Methodenname"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "Bedingung erwartet"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Unbekannter Rückgabetyp"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "Anweisung erwartet"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Unbekannter Fehler"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for-Initialisierung erwartet"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Dies ist ein reserviertes Schlüsselwort in der aktuell gewählten "
+"Generierungssprache."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch erwartet"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserviertes Schlüsselwort"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2261,105 +2333,66 @@ msgstr "Objektnamen eingeben:"
 msgid "new_parameter"
 msgstr "neuer_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Allgemeine Einstellungen"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paket als Namensraum"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuelle Destruktoren"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Leere Konstruktoren erzeugen"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Zugriffsfunktionen erzeugen"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operationen sind inline"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Zugriffsfunktionen sind inline"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Zugriffsfunktionen sind public"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagramm: %2 Seite %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Diagrammname eingeben"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Basisklasse hinzufügen"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Geben Sie den neuen Namen des Diagramms ein:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Abgeleitete Klasse hinzufügen"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Sie sind dabei, das gesamte Diagramm zu löschen.\n"
-"Sind Sie sicher?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Operation hinzufügen"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Diagramm löschen?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Attribut hinzufügen"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Umbenennen abgebrochen"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Basisschnittstelle hinzufügen"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Umbenennen eines Objektes mit dem Typ %1 wird noch nicht unterstützt."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Abgeleitete Schnittstelle hinzufügen"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funktion nicht implementiert"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Basisklassifizierer"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Der von Ihnen eingegebene Name ist ungültig.\n"
-"Das Umbenennen wurde abgebrochen."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Abgeleiteter Klassifizierer"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "neue_assoziation"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Zustandsname eingeben"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "neues_attribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Geben Sie den Namen des neuen Zustandes ein:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "neue_klassen_vorlage"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Aktivität eingeben"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "neue_operation"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Unzulässige Verwendung einer Assoziation."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "neue_aufzaehlung"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Assoziationsfehler!"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "neues_feld"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "neuer_zustand"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2515,11 +2548,6 @@ msgstr "Als Bild e&xportieren ..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "&Alle Diagramme als Bilder exportieren ..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "Ei&genschaften"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Zoom-Schieberegler"
@@ -2604,21 +2632,28 @@ msgstr "&Dokumentation"
 msgid "Opening file..."
 msgstr "Datei wird geöffnet ..."
 
+#: 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 "Neues Dokument wird angelegt ..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Alle unterstützten Dateitypen (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Alle unterstützten Dateitypen (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Unkomprimierte XMI-Dateien (*.xmi)\n"
 "*.xmi.tgz|Gzip komprimierte XMI-Dateien (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 komprimierte XMI-Dateien (*.xmi.tar.bz2)\n"
@@ -2648,6 +2683,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-komprimierte XMI-Datei\n"
 "*|Alle Dateien"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2656,6 +2695,10 @@ msgstr ""
 "Die Datei %1 existiert bereits.\n"
 "Soll sie überschrieben werden?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Überschreiben"
@@ -2691,11 +2734,11 @@ msgstr "Inhalt der Zwischenablage wird eingefügt ..."
 
 #: 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 ""
-"Umbrello kann den Inhalt der Zwischenablage nicht einfügen. Das Objekt in der "
-"Zwischenablage hat möglicherweise den falschen Typ, um hier eingefügt zu "
+"Umbrello kann den Inhalt der Zwischenablage nicht einfügen. Das Objekt in "
+"der Zwischenablage hat möglicherweise den falschen Typ, um hier eingefügt zu "
 "werden."
 
 #: uml.cpp:863
@@ -2753,1266 +2796,1325 @@ msgstr "Alle Dateien"
 msgid "Select Code to Import"
 msgstr "Bitte Quelltext für Import wählen"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Klassenname:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Akteur&name:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "neues_attribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Paketname:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "neue_klassen_vorlage"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Anwendungsfall&name:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "neue_operation"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Schnittstellen&name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "neue_aufzaehlung"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponenten&name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "neues_feld"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artefakt&name:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-Modell"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Name &Aufzählung:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logische Ansicht"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datentyp&name:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Anwendungsfallansicht"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Name &Entität:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentenansicht"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Stereot&ypname:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Verteilungsansicht"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Paketname:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entity-Relationship-Modell"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Ab&strakte Klasse"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datentypen"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Ab&strakter Anwendungsfall"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Die aktuelle Datei wurde verändert.\n"
+"Wollen Sie die Datei jetzt speichern?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Ausführbar"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Die Datei %1 existiert nicht."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Zeichnen als"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Die Datei %1 scheint beschädigt zu sein."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Standard"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Es konnte keine XMI-Datei in der gepackten Datei %1 gefunden werden."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "B&ibliothek"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Beim Laden der entpackten Datei %1 ist ein Fehler aufgetreten."
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "T&abelle"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Beim Laden der Datei %1 ist ein Fehler aufgetreten."
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublic"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Beim Hochladen der Datei %1 ist ein Fehler aufgetreten."
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivate"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "Anwendungsfalldiagramm"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Klassendiagramm"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "I&mplementierung"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "Sequenzdiagramm"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klassenname:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "Kollaborationsdiagramm"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instanzname:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "Zustandsdiagramm"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Als Akteur zeichnen"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "Aktivitätsdiagramm"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Mehrfache Instanz"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "Komponenten-Diagramm"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Dekonstruktion anzeigen"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "Verteilungsdiagramm"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponentenname:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "Entity-Relationship-Diagramm"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Knotenname:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Das ist ein ungültiger Name für ein Diagramm."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotypname:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Es existiert bereits ein Diagramm mit diesem Namen."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Der von Ihnen gewählte Name ist bereits vergeben.\n"
-"Der Name wurde zurückgesetzt."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Der Name ist nicht eindeutig."
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linie:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Füllfarbe:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "S&tandard"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Elemente füllen"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivitäten"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Neue Aktivität ..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Umbenennen"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Neue Aktivität"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Aktivität umbenennen"
+"Der eingegebene Name ist nicht eindeutig!\n"
+"Ist dies beabsichtigt?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Geben Sie den neuen Namen der Aktivität ein:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Namen beibehalten"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Assoziationseigenschaften"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Neuen Namen eingeben"
 
-#: 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 "Allgemeine Einstellungen"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Sind Sie sicher, dass Sie das Diagramm %1 löschen wollen?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Rollen"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Diagramm löschen"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rollen-Einstellungen"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Dokument wird vorbereitet ..."
 
-#: 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 "Schrift-Einstellungen"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Objektreferenzen werden aufgelöst ..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Schrift für Assoziation"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML-Elemente werden geladen ..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Klassen-Vorlagen-Eigenschaften"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Diagramme werden geladen ..."
 
-#: 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 "Allgemeine Eigenschaften"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autospeichern%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Typ:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Ordner auslagern"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Name:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Modellnamen eingeben"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Sie haben einen ungültigen Namen für eine Klassen-Vorlage eingegeben."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Geben Sie den neuen Namen des Modells ein:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Der Name der Klassen-Vorlage ist ungültig."
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Ansichten"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"Der von Ihnen gewählte Vorlagenparametername ist in dieser Operation bereits "
-"vergeben."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Der Vorlagenparametername ist nicht eindeutig."
+"Der von Ihnen eingegebene Name ist ungültig.\n"
+"Der Erstellungsvorgang wurde abgebrochen."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Eigenschaften Entität-Attribut"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Der Name ist ungültig."
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Standardwert:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Der eingegebene Name ist nicht eindeutig.\n"
+"Der Erstellungsprozess wurde abgebrochen."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Länge/Werte:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Erstellungsprozess abgebrochen"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto-Inkrement"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Listendarstellung wird geladen ..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "&Null erlauben"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Der Ordner muss leer sein bevor er gelöscht werden kann."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attribute:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Der Ordner ist nicht leer."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indizierung"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Umbenennen abgebrochen"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Keine"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Umbenennen eines Objektes mit dem Typ %1 wird noch nicht unterstützt."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primär"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funktion nicht implementiert"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Der von Ihnen eingegebene Name ist ungültig.\n"
+"Das Umbenennen wurde abgebrochen."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unique"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagramm: %2 Seite %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Sie haben einen ungültigen Entitätsattributnamen eingegeben."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Diagrammname eingeben"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Der Entitätsattributname ist ungültig."
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Geben Sie den neuen Namen des Diagramms ein:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Der von Ihnen gewählte Entitätsattributname ist in dieser Operation bereits "
-"vergeben."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Der Entitätsattributname ist nicht eindeutig."
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Anzeige"
+"Sie sind dabei, das gesamte Diagramm zu löschen.\n"
+"Sind Sie sicher?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Klassen-Anzeigeoptionen"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Diagramm löschen?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagrammfarben"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Ansicht wird exportiert ..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Der von Ihnen eingegebene Name ist ungültig."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Beim Exportieren des Bildes ist ein Fehler aufgetreten:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Der von Ihnen eingegebene Name ist nicht eindeutig."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Die gewählte Datei %1 existiert bereits.\n"
+"Soll sie überschrieben werden?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Typ:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Datei existiert bereits"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello einrichten"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Der Ordner lässt sich nicht erstellen: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Benutzerschnittstelle"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ein leeres Diagramm kann nicht gespeichert werden."
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Einstellungen Benutzerschnittstelle"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Beim Speichern des Diagramms in %1 ist ein Problem aufgetreten."
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Linienfarbe:"
+#: 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 ""
+"Halten Sie für eine Bewegung entlang der X-Achse die Umschalt- oder Strg-"
+"Taste gedrückt. Ein Klick mit der rechten Maustaste bricht den "
+"Verschiebevorgang ab."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "S&tandardfarbe"
+#: 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 ""
+"Halten Sie für eine Bewegung entlang der X-Achse die Umschalt- oder Strg-"
+"Taste gedrückt. Ein Klick mit der rechten Maustaste bricht die "
+"Größenänderung ab."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Füllfarbe:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "&Standardfarbe"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synchrone Nachricht"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Linienstärke:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynchrone Nachricht"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "St&andardstärke:"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Textzeile"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Elemente füllen"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Notiz"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Rückgängig/Wiederherstellen a&ktivieren"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Rahmen"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Unterfenster verwenden"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Beziehung"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Neue C++/Java/Ruby-Quelltextgeneratoren verwenden"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Gerichtete Assoziation"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Eckige Assoziationslinien verwenden"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementiert (Verallgemeinerung/Realisierung)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatisches Speichern"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Tiefe Historie"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Automatisches Speichern &aktivieren"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Flache Historie"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Intervall für automatisches Speichern (in Minuten):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Vereinigung"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Dateiendung für automatische Speicherung:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Verzweigung"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Die Datei zum automatischen Speichern wird unter ~/autosave.xmi abgelegt, "
-"wenn die automatische Speicherung vor einer manuellen Speicherung erfolgt.<qt>"
-"<p>Wenn Sie bereits manuell gespeichert haben, wird die Datei zur automatischen "
-"Speicherung in dem gleichen Ordner wie die manuell gespeicherte Datei abgelegt "
-"und erhält den gleichen Namen gefolgt von der angegebenen Endung.</p>"
-"<p>Wenn die gewählte Dateiendung gleich der Endung der manuell gespeicherten "
-"Datei ist, so wird die Datei automatisch überschrieben.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Abzweigung"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Start"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Auswahl"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Sta&rtbildschirm"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Aktivitätsübergang"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Tipp des Tages"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Nachricht"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Letztes Projekt laden"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "UNDEFINIERT"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Neues Projekt starten mit:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Auswahl"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Kein Diagramm"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Klassendiagramm"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Anwendungsfalldiagramm"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sequenzdiagramm"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Kollaborationsdiagramm"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Operationen anzeigen"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Zustandsdiagramm"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Aktivitätsdiagramm"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Diagramm leeren"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponenten-Diagramm"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Verteilungsdiagramm"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Verallgemeinerung"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klassen-Einstellungen"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "&Sichtbarkeit anzeigen"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Attribute anzeigen"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Assoziationenname"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Operationen anzeigen"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Stereo&typ anzeigen"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Attributsignatur anzeigen"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Paket anzeigen"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Standard"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Startsichtbarkeit"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Voreingestellte Attribut-Sichtbarkeit:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Strich-Strich (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Voreingestellte Operations-Sichtbarkeit:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Strich-Stern (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Quelltextgenerierung"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Quelltextgenerierungs-Einstellungen"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++-Quelltextgenerierung</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Quelltext-Betrachter-Einstellungen"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Quelltextgenerierung für Methode"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operation-Eigenschaften"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Folgende für Klassen in generiertem Quelltext verwenden:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstrakte Operation"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Kla&ssifizierer-Sichtbarkeit (\"statisch\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Query (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variable</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementierung"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parameter"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Neuer &Parameter ..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Zeichenfolge</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Sie haben einen ungültigen Parameternamen eingegeben."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Liste</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Der Parametername ist ungültig."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Der von Ihnen gewählte Parametername\n"
-"ist in dieser Operation bereits vergeben."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Der Parametername ist nicht eindeutig."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"Der von Ihnen gewählte Parametername ist in dieser Operation bereits vergeben."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klassenname"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Sie haben einen ungültigen Operationsnamen eingegeben."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\"><b>Includes</b></p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Der Operationsname ist ungültig."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projekterstellung"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Eine Operation mit dieser Signatur existiert bereits in %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "ANT-Projekt erstellen"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Wählen Sie einen anderen Namen oder eine andere Parameterliste."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Automatisch erzeugte Funktionen"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Eigenschaften von Rolle A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Leere Konstruktoren"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Eigenschaften von Rolle B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Zugriffsfunktion für Assoziation"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Sichtbarkeit von Rolle A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Zugriffsfunktion für Attribute"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Sichtbarkeit von Rolle B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Vom Elternobjekt"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Änderbarkeit von Rolle A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Standard-Attribut-Sichtbarkeit:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Änderbarkeit von Rolle B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Standard-Assoziationsfeld-Umfang:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Enthaltene Elemente"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Von Elternrolle"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Notizdokumentation"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java-Quelltextgenerierung</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Neues &Attribut ..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hash (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Neue O&peration ..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Beginn-Ende (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Klassen-Vorlage"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby-Quelltextgenerierung</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&eue Klassen-Vorlage ..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Sprache"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Aufzählungselement"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Ordner"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&eues Aufzählungselement ..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Ordner für generierte Dateien:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entitätsattribut"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Aus&wählen ..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&eues Entitätsattribut ..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Au&swählen ..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Anfangsaktivität"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Einbeziehen der Header-Dateien aus Ordner:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Endaktivität"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"In diesem Ordner werden die durch die Quelltextgenerierung erzeugten Dateien "
+"abgelegt."
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Aktivitätstyp:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Dateien in diesem Ordner werden für die Quelltextgenerierung als Header-"
+"Dateien genutzt."
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Aktivitätsname:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Überschreibungs-Regelung"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Objektfarben"
+#: 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 ""
+"Wenn bereits eine Datei mit dem gleichen Namen wie von der "
+"Quelltextgenerierung für die Ausgabe vorgesehen existiert:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attribut-Eigenschaften"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Über&schreiben"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Anfangswert:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Dateien überschreiben, wenn sie im Zielordner bereits existieren"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Nach&fragen"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Sie haben einen ungültigen Attributnamen eingegeben."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Existiert bereits eine Datei mit gleichen Namen, dann wird nachgefragt, was "
+"zu tun ist."
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Der Attributname ist ungültig."
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Anderen &Dateinamen verwenden"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"Der von Ihnen gewählte Attributname ist in dieser Operation bereits vergeben."
+"Wenn im Ausgabeordner bereits eine Datei mit gleichem Namen existiert, wird "
+"ein anderer Name durch Anhängen einer Erweiterung verwendet."
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Der Attributname ist nicht eindeutig."
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatierung"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Operation auswählen"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linien"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sequenznummer:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Linienende-Stil:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klassenoperation:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Quelltexteinrückung:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Angepasste Operation:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Umfang der Quelltexteinrückung:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramme"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "A&ktuelles Diagramm"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Macintosh (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Alle Diagramme"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Keine Quelltexteinrückung"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "Diagramme &wählen"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulator"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "Diagramm&typ"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Leerzeichen"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Auswahl"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Umfang Quelltextkommentare"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Kollaboration"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Erzeugt &Kommentare für Abschnitte, selbst wenn diese leer sind"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sequenz"
+#: 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 ""
+"Erzeugt Kommentare, um die verschiedenen Abschnitte (public, private usw.) "
+"in einer Klasse zu kennzeichnen, selbst wenn diese leer sind."
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Verteilung"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Erzeugt Dokumentations-Kommentare, selbst wenn diese leer sind"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Keine Diagramme ausgewählt."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Erzeugt Kommentare &für Klassen und Methoden-Dokumentation, selbst wenn "
+"diese leer sind"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Anzeigeoptionen"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Spracheinstellungen"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribut-Einstellungen"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Assistent für die Quelltext-Generierung"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operation-Einstellungen"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Klassen auswählen"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Klassen-Vorlage-Einstellungen"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Platzieren Sie alle Klassen, für die Sie Quelltext erzeugen wollen,\n"
+"in der rechten Liste."
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Aufzählungselement-Einstellungen"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Klasse für Quelltextgenerierung hinzufügen."
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Entitätattribut-Einstellungen"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Ausgewählte Klassen"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Inhalt-Eigenschaften"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Klasse von Quelltextgenerierung ausschließen"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Assoziationen"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Vorhandene Klassen"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klassenassoziationen"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Status Quelltextgenerierung"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operatio&nen"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Drücken Sie auf Erzeugen, um die Quelltextgenerierung zu starten."
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Sichtbarkeit"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Status der Generierung"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Signatur der O&peration"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Versteckte Blöcke anzeigen"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ket"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">Komponenten-Name hier</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ribute"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&yp"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Blocktyp anzeigen"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Signatur des Attr&ibuts"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Farben"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Als Kreis zeichnen"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Schrift:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Anfangszustand"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papier:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Endzustand"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Ausgewählt:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Zustandstyp:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML-Objekt-Block:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Zustandsname:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Versteckter Block:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Objektfarbe"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Nicht änderbarer Text:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "neue_klasse"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Änderbarer Text:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Neue Klasse"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagramm-Eigenschaften"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klassenattribute"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zoom:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klassenoperationen"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameter-Eigenschaften"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Raster anzei&gen"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Übergaberichtung"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Einrasten am Ras&ter"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Komponentengröße anpassen"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"rein\" ist ein nur lesender Parameter, \"raus\" ist ein nur schreibender "
-"Parameter und \"reinraus\" ist ein lesender und schreibender Parameter."
+"Die Größe der Komponenten wird an die Rastergröße angepasst.\n"
+"Ist \"Einrasten am Raster\" ausgewählt, wird eine Komponente immer mit allen "
+"4 Seiten am Raster ausgerichtet."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Erzeugen"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Rasterabstand:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Fertig"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Quelltext generiert"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Nicht erzeugt"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Linienstärke:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Noch nicht erzeugt"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Alle Ansichten exportieren"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Der Ordner %1 existiert noch nicht. Soll er jetzt erstellt werden?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Ordner zum Speichern der Diagramme:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Ausgabeordner existiert nicht"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Der Basisordner zum Speichern der Bilder"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Ordner erstellen"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Bildtyp:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Datei nicht erstellen"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "&Ordner verwenden"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Der Ordner kann nicht angelegt werden.\n"
-"Bitte vergewissern Sie sich, dass Sie Schreibrechte auf den übergeordneten "
-"Ordner besitzen oder wählen Sie einen gültigen Ordner."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Fehler beim Anlegen des Ordners"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Bitte wählen Sie einen gültigen Ordner!"
+"Erzeugt im Zielordner die gleiche Baumstruktur, die auch zum Speichern der "
+"Ansichten im Dokument verwendet wird."
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Der Ausgabeordner existiert, ist aber nicht beschreibbar.\n"
-"Bitte setzen Sie die entsprechenden Rechte oder wählen Sie einen anderen "
-"Ordner!"
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Fehler beim Schreiben in den Ausgabeordner"
+"Die Ansichten werden im Dokument in Ordner gespeichert. Die gleiche "
+"Baumstruktur, die im Dokument zum Speichern der Ansichten verwendet wird, "
+"kann auch im gewählten Basisordner erzeugt werden.\n"
+"Nur die vom Anwender erstellten Ordner werden auch im Basisordner erstellt "
+"(die logische Ansicht, Anwendungsfallansicht usw. werden nicht erzeugt)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr ""
-"%1 scheint kein Ordner zu sein. Bitte wählen Sie einen gültigen Ordner!"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Rollen-Änderbarkeit"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Bitte einen gültigen Ordner wählen"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Rollen-Sichtbarkeit"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Die Zieldatei existiert bereits"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportieren"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Die Datei %1 existiert bereits in %2.\n"
-"\n"
-"Umbrello kann die Datei überschreiben, einen ähnlichen Namen\n"
-"erzeugen oder das Erstellen der Datei abbrechen."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "Auf alle übrigen Dateien &anwenden"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Über&schreiben"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "Ähnlichen Dateinamen &generieren"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Datei nicht erstellen"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Keine Optionen verfügbar.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplizität"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Multiplizität eingeben:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Assoziationenname"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Assoziations-Name eingeben:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rollenname"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Rollen-Name eingeben:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Operations-Name eingeben:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Neuen Text eingeben:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "Fehler"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Text ändern"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Links ausrichten"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Rechts ausrichten"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "Dia&gramm"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Oben ausrichten"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Neu"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Unten ausrichten"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Anzeigen"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Vertikal mittig ausrichten"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zoom:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Horizontal mittig ausrichten"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Quelltext"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Vertikal verteilt ausrichten"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Aktive Sprache"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Horizontal verteilt ausrichten"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Zum Ausrichten müssen mindestens 2 Objekte wie Klassen und Akteure ausgewählt "
-"sein. Assoziationen können nicht ausgerichtet werden."
+"<p>Willkommen zu Umbrello.</p>\n"
+"<p>Mit UML-Diagrammen können Sie objektorientierte Software entwerfen und "
+"dokumentieren. <a href=\"help:/umbrello\">Das Handbuch zu Umbrello</a> gibt "
+"eine gute Einführung in UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Dies ist ein reserviertes Schlüsselwort in der aktuell gewählten "
-"Generierungssprache."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reserviertes Schlüsselwort"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Ansicht wird exportiert ..."
+"<p>Willkommen zu Umbrello 1.5. Neu in dieser Version sind "
+"Assoziationsklassen, Ruby Quelltextgenerierung, auslagerbare Ordner, die "
+"Möglichkeit Schnittstellen in Klassen umzuwandeln, und vieles mehr.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Beim Exportieren des Bildes ist ein Fehler aufgetreten:\n"
+"<p>Die beiden Funktionen Arbeiten mit Unterfenstern und das Auslagern von "
+"Ordnern in eigene Dateien können nicht gleichzeitig genutzt werden. Werden "
+"ausgelagerte Ordner benötigt, muss &quot;Unterfenster verwenden&quot; in den "
+"allgemeinen Einstellungen deaktiviert werden.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Die gewählte Datei %1 existiert bereits.\n"
-"Soll sie überschrieben werden?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Datei existiert bereits"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "neuer_akteur"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "neuer_anwendungsfall"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "neues_paket"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "neue_komponente"
+"<p>Wussten Sie, dass die meisten Diagrammobjekte nicht in ihrer Größe "
+"geändert werden können? Sie passen ihre Größe automatisch dem Inhalt an. "
+"Rahmen, Notizen und Sequenzdiagrammnachrichten können in ihrer Größe "
+"verändert werden, einfach am roten Rechteck anfassen und ziehen.</p>\n"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "neuer_knoten"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "neues_artefakt"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "neue_schnittstelle"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "neuer_datentyp"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "neue_aufzaehlung"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "neue_entitaet"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "neuer_ordner"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "neues_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Leer"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Missgebildetes Argument"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Unbekannter Argumententyp"
+#: 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 ""
+"<p>Wussten Sie, dass Sie eine bereits existierende Klasse zu einem Diagramm "
+"hinzufügen können, indem Sie die Klasse aus der Baumansicht auf das Diagramm "
+"ziehen? </p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Unzulässiger Methodenname"
+#: 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 ""
+"<p>Wussten Sie, dass Sie mit Umbrellos Refactoring-Assistenten Operationen "
+"einer Klasse in die Basisklasse oder abgeleitete Klasse verschieben können?\n"
+"Sie rufen den Refactoring-Assistenten über einen Rechtsklick auf die Klasse "
+"auf.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Unbekannter Rückgabetyp"
+#: 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 ""
+"<p>Wussten Sie, dass Objekte in Sequenzdiagrammen eine Box für das Ende der "
+"Lebenszeit des Objektes haben und als Akteure gezeichnet werden können?</"
+"p><p>Ein Doppelklick ruft den Eigenschaften-Dialog auf.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Unbekannter Fehler"
+#: 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 ""
+"<p>Wussten Sie, dass Sequenzdiagrammnachrichten als Konstruktor benutzt "
+"werden können? Klicken Sie dazu auf das Objekt, anstatt auf die vertikale "
+"Lebenslinie.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Basisklasse hinzufügen"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Wussten Sie, dass Sequenzdiagramme Nachrichten auf sich selbst "
+"unterstützten? Klicken Sie auf die vertikale Lebenslinie erneut, um solch "
+"eine Nachricht zu erstellen.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Abgeleitete Klasse hinzufügen"
+#: 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 ""
+"<p>Wussten Sie, dass wenn nach dem Laden einer fremden Datei nichts in der "
+"Listenansicht angezeigt wird, Sie das Modell unter einem anderen Namen "
+"speichern sollten und erneut laden. In den meisten Fällen ist die "
+"Listendarstellung dann vollständig.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Operation hinzufügen"
+#: 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 ""
+"<p>Wussten Sie, dass \"Ausschneiden\" und \"Kopieren\" auch ein PNG-Bild in "
+"die Zwischenablage ablegt, das z. B. in KWord oder anderen Anwendungen "
+"eingefügt werden kann?</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Attribut hinzufügen"
+#: 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 ""
+"<p>Wussten Sie, dass Assoziationen nicht immer gerade Linien sein müssen?\n"
+"Durch einen Doppelklick auf eine Assoziation wird ein Punkt erzeugt, der "
+"sich verschieben lässt.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Basisschnittstelle hinzufügen"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Wussten Sie, dass Sie im Eigenschaften-Dialog die automatische "
+"Speicherung einschalten können?</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Abgeleitete Schnittstelle hinzufügen"
+#: 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 ""
+"<p>Fehlt eine Funktion in Umbrello? Bitte teilen Sie uns Ihre Idee mit.\n"
+"Entweder berichten Sie Ihre Idee über \"Probleme oder Wünsche berichten ..."
+"\" im Hilfe-Menü an die Fehlerdatenbank oder Sie senden eine E-Mail an die "
+"Mailingliste uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Basisklassifizierer"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Wussten Sie, dass Sie alle ausgewählten Objekte durch Drücken der Tasten "
+"\"Entf\" oder \"Rückschritt\" löschen können?</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Abgeleiteter Klassifizierer"
+#: 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 ""
+"<p>Wenn Sie Fehler gefunden haben, melden Sie uns diese bitte. Sie können "
+"die Fehlermeldungen über den Eintrag \"Probleme oder Wünsche berichten ...\" "
+"aus dem Hilfe-Menü an uns weiterleiten.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Der Ordner lässt sich nicht erstellen: %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 ""
+"<p>Wussten Sie, dass Sie mit der Escape-Taste das Bewegungswerkzeug aus der "
+"Werkzeugleiste auswählen?\n"
+"Mit der Rücktaste springen Sie zurück zum zuletzt benutzten Werkzeug.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Ein leeres Diagramm kann nicht gespeichert werden."
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>Wussten Sie, dass Sie alle Objekte durch Betätigen von Strg-A auswählen "
+"können?</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Beim Speichern des Diagramms in %1 ist ein Problem aufgetreten."
+#: tips:127
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
+msgstr ""
+"<p>Wussten Sie, dass Sie mit Hilfe des Klassenassistenten im Menü \"Quelltext"
+"\" eine neue Klasse erstellen und einrichten können?</p>\n"
diff --git a/tde-i18n-el/messages/tdesdk/umbrello.po b/tde-i18n-el/messages/tdesdk/umbrello.po
index 180b415ea15..07f6a4d86d4 100644
--- a/tde-i18n-el/messages/tdesdk/umbrello.po
+++ b/tde-i18n-el/messages/tdesdk/umbrello.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-03-17 16:57+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -16,245 +16,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Αυτόνομη γεννήτρια κώδικα του μοντελοποιητή Umbrello UML"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Αρχείο για μετασχηματισμό"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Το αρχείο XSLT που θα χρησιμοποιηθεί"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 οι συγγραφείς του "
-"Μοντελοποιητή Umbrello UML"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Συγγραφείς μοντελοποιητή Umbrello UML"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Σπύρος Γεωργαράς,Τούσης Μανώλης"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Εξαγωγή όλων των προβολών..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sng@hellug.gr,manolis@koppermind.homelinux.org"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Παρουσιάστηκαν κάποια σφάλματα κατά την εξαγωγή των εικόνων:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "Υπήρξε ένα πρόβλημα κατά την αποθήκευση του αρχείου: %1"
+#: 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/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 "Σφάλμα αποθήκευσης"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Στοίχιση αριστερά"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Αντικείμενο"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Στοίχιση δεξιά"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Σύγχρονο μήνυμα"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Στοίχιση πάνω"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Ασύγχρονο μήνυμα"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Στοίχιση κάτω"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Συσχέτιση"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Στοίχιση κατακόρυφη στο μέσο"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Περίληψη"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Στοίχιση οριζόντια στο μέσο"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Αγκίστρωση"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Ισοκατανεμημένη κατακόρυφη στοίχιση"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Ετικέτα"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Ισοκατανεμημένη οριζόντια στοίχιση"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Σημείωση"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Για τη στοίχιση πρέπει να επιλέξετε τουλάχιστον 2 αντικείμενα όπως κλάσεις ή "
+"δράστες. Δε μπορείτε να στοιχίσετε συσχετίσεις."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Πλαίσιο"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Μορφοποίηση"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Δράστης"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Εξάρτηση"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Γενίκευση"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Αύξηση"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Σχέση"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Κατευθυντήρια συσχέτιση"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Υλοποιεί (γενίκευση/πραγματοποίηση)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Σύνθεση"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "Κλάση"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Αρχική κατάσταση"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Τελική κατάσταση"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Κλάδος/συγχώνευση"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Διακλάδωση/σύνδεση"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Πακέτο"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Συστατικό"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Κόμβος"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Εξάρτηση"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Δημιούργημα"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Συσχέτιση"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Διασύνδεση"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Ίδια συσχέτιση"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Τύπος δεδομένων"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Μήνυμα συνεργασίας"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Αρίθμηση"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Μήνυμα ακολουθίας"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Οντότητα"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Ίδιο μήνυμα συνεργασίας"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Μακρύ ιστορικό"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Ίδιο μήνυμα ακολουθίας"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Σύντομο ιστορικό"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Περίληψη"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Σύνδεση"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Σύνθεση"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Διακλάδωση"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Πραγματοποίηση"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Σύνδεσμος"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Ολική συσχέτιση"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Επιλογή"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Αγκίστρωση"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Μετάβαση κατάστασης"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Μετάβαση δραστηριότητας"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Δραστηριότητα"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Κατάσταση"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Πολλαπλότητα"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Τελική δραστηριότητα"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Εισαγωγή πολλαπλότητας:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Αρχική δραστηριότητα"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Όνομα συσχέτισης"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Μήνυμα"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Εισαγωγή ονόματος συσχέτισης:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "ΑΠΡΟΣΔΙΟΡΙΣΤΟ"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Όνομα ρόλου"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Επιλογή"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Εισαγωγή ονόματος ρόλου:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Αυτό είναι ένα μη έγκυρο όνομα."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Μη έγκυρο όνομα"
+
+#: 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 "Αυτό το όνομα χρησιμοποιείται ήδη."
+
+#: 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 "Το όνομα δεν είναι μοναδικό"
 
 #: 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."
+"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 ""
 "Τουλάχιστον ένα από τα αντικείμενα στο πρόχειρο δε μπόρεσε να επικολληθεί "
 "επειδή ένα αντικείμενο με το ίδιο όνομα υπάρχει ήδη.  Όλα τα υπόλοιπα "
@@ -277,10 +237,8 @@ msgid "Cannot Open File"
 msgstr "Αδυναμία ανοίγματος αρχείου"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Αδυναμία δημιουργίας του φακέλου:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Αδυναμία δημιουργίας του φακέλου:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -294,1364 +252,1528 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Αδυναμία δημιουργίας φακέλου"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Εισαγωγή ονόματος κατάστασης"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Γενικές επιλογές"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Εισαγωγή ονόματος της νέας κατάστασης:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Το πακέτο είναι ένας χώρος ονομάτων"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Εισαγωγή δραστηριότητας"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Εικονικοί καταστροφείς"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Εισάγετε το όνομα μιας νέας δραστηριότητας:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Δημιουργία κενών κατασκευαστών"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "νέα δραστηριότητα"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Δημιουργία μεθόδων πρόσβασης"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Μοντέλο UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Οι λειτουργίες είναι εμβόλιμες"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Λογική προβολή"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Οι μέθοδοι πρόσβασης είναι εμβόλιμες"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Προβολή περιπτώσεων χρήσης"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Οι μέθοδοι πρόσβασης είναι δημόσιες"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Προβολή συστατικών"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Εισαγωγή αρχείου: %1 Πρόοδος: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Προβολή ετοιμασίας"
+#: 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 "Έτοιμο."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Μοντέλο σχέσεων οντότητας"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Η εμβέλεια %1 είναι ένας χώρος ονομάτων ή μια κλάση;"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Τύποι δεδομένων"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Η εισαγωγή C++ ζητά τη βοήθειά σας"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Το τρέχον αρχείο έχει τροποποιηθεί.\n"
-"Επιθυμείτε να το αποθηκεύσετε;"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Χώρος ονομάτων"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Το αρχείο %1 δεν υπάρχει."
+#: 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 "Κλάση"
 
-#: 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 "Σφάλμα φόρτωσης"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Εσωτερικό σφάλμα"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Το αρχείο %1 μοιάζει να είναι χαλασμένο."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Συντακτικό σφάλμα πριν το '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Δε βρέθηκε αρχείο XMI στο συμπιεσμένο αρχείο %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Σφάλμα ανάλυσης πριν το '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Υπήρξε ένα πρόβλημα κατά τη φόρτωση του εξαγόμενου αρχείου: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Υπήρξε ένα πρόβλημα κατά τη φόρτωση του αρχείου: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "αναμενόταν έκφραση"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Υπήρξε ένα πρόβλημα κατά την ενημέρωση του αρχείου: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Συντακτικό σφάλμα δήλωσης"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "διάγραμμα περίπτωσης χρήσης"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "αναμενόταν }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "διάγραμμα κλάσης"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "αναμενόταν χώρος ονομάτων"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "διάγραμμα ακολουθίας"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "αναμενόταν {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "διάγραμμα συνεργασίας"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Αναμενόταν όνομα χώρου ονομάτων"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "διάγραμμα κατάστασης"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Χρειάζεται δήλωση ορισμού τύπου"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "διάγραμμα δραστηριότητας"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "αναμενόταν μια δήλωση"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "διάγραμμα συστατικού"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Αναμενόταν σταθερή έκφραση"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "διάγραμμα ετοιμασίας"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "αναμενόταν ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "διάγραμμα σχέσεων οντότητας"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "Όνομα"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "Εισαγωγή ονόματος:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Αναμενόταν ορισμός βασικής κλάσης"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Αυτό είναι ένα μη έγκυρο όνομα διαγράμματος."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Αναμενόταν πρόταση αρχικοποίησης"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Μη έγκυρο όνομα"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Αναμενόταν προσδιορισμός"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Ένα διάγραμμα χρησιμοποιεί ήδη αυτό το όνομα."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "Το όνομα δεν είναι μοναδικό"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "Αυτό είναι ένα μη έγκυρο όνομα."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "Αυτό το όνομα χρησιμοποιείται ήδη."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "αναμενόταν δήλωση"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Το όνομα που εισάγατε δεν ήταν μοναδικό.\n"
-"Είναι αυτό που επιθυμείτε;"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "αναμενόταν αρχικοποίηση for"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Μη μοναδικό όνομα"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "αναμενόταν catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Χρήση ονόματος"
+#: 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 "&Ιδιότητες"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Εισαγωγή νέου ονόματος"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Αρχική δραστηριότητα"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Είστε σίγουροι ότι επιθυμείτε τη διαγραφή του διαγράμματος %1;"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Τελική δραστηριότητα"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Διαγραφή διαγράμματος"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Κλάδος/συγχώνευση"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Ρύθμιση του εγγράφου..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Διακλάδωση/σύνδεση"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Επίλυση αναφορών αντικειμένων..."
+#: 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 "Γενικά"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Φόρτωση στοιχείων UML..."
+#: 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 "Γενικές ιδιότητες"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Φόρτωση διαγραμμάτων..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Τύπος δραστηριότητας:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-διάγραμμα"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Όνομα δραστηριότητας:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/αυτόματηαποθήκευση%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 "Τεκμηρίωση"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "Γραμματοσειρά:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "Ρυθμίσεις γραμματοσειράς"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "Χρώμα"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Προβολές"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Χρώματα γραφικού συστατικού"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Το όνομα που εισάγατε ήταν μη έγκυρο.\n"
-"Η διεργασία δημιουργίας ακυρώθηκε."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Δραστηριότητες"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Μη έγκυρο όνομα"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Νέα δραστηριότητα..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Το όνομα που εισάγατε δεν ήταν μοναδικό!\n"
-"Η διεργασία δημιουργίας ακυρώθηκε."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Διαγραφή αγκίστρωσης"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Η δημιουργία ακυρώθηκε"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Μετονομασία"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Φόρτωση προβολής λίστας..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Νέα δραστηριότητα"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Ο φάκελος πρέπει να αδειάσει πριν να μπορεί να διαγραφεί."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "νέα δραστηριότητα"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Ο φάκελος δεν είναι κενός"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Μετονομασία δραστηριότητας"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Μια λειτουργία με το ίδιο όνομα και υπογραφή υπάρχει ήδη. Δε μπορείτε να την "
-"προσθέσετε ξανά."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Εισάγετε το νέο όνομα της δραστηριότητας:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Εισαγωγή ονόματος δραστηριότητας"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Όνομα:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "νέα κατάσταση"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Τύπος:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Γενίκευση"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Συσχετίσεις"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Ίδια συσχέτιση"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Ιδιότητες συσχέτισης"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "Γενικές ρυθμίσεις"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Μήνυμα ακολουθίας"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Ρόλοι"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Ίδιο μήνυμα συνεργασίας"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Ρυθμίσεις ρόλων"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Ίδιο μήνυμα ακολουθίας"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Γραμματοσειρά συσχέτισης"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Πραγματοποίηση"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Ιδιότητες ρόλου Α"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Ολική συσχέτιση"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Ιδιότητες ρόλου Β"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "Ε&ξαγωγή"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Ορατότητα ρόλου Α"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Διάγραμμα"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Ορατότητα ρόλου Β"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Νέο"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Προσαρμοστικότητα ρόλου Α"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Εμ&φάνιση"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Προσαρμοστικότητα ρόλου Β"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Κώδικας"
+msgid "Rolename:"
+msgstr "Όνομα ρόλου:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Ενεργή &γλώσσα"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "Τεκμηρίωση"
+msgid "Public"
+msgstr "Δημόσιο"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Κάθετος-Κάθετος (//)"
+msgid "Private"
+msgstr "Προσωπικό"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Κάθετος-Αστέρι (/**  */)"
+msgid "Protected"
+msgstr "Προστατευμένο"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Στυλ:"
+msgid "Implementation"
+msgstr "Υλοποίηση"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ Δημιουργία Κώδικα</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Γενικά"
+msgid "Frozen"
+msgstr "Παγιωμένο"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Δημιουργία σώματος μεθόδου"
+msgid "Add only"
+msgstr "Μόνο προσθήκη"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Χρήση των παρακάτω για τις κλάσεις στο δημιουργημένο κώδικα:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Ό&νομα κλάσης:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Όνομα &δράστη:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Όνομα &πακέτου:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Μεταβλητή</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Όνομα περίπτωσης &χρήσης:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Όνομα &διασύνδεσης:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Όνομα συ&στατικού:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Όνομα δη&μιουργήματος:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Αλφαριθμητικό</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Όνομα αρί&θμησης:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Λίστα</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Όνομα τύπου δε&δομένων:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Όνομα ον&τότητας:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Ό&νομα στερεότυπου:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Όνομα &πακέτου:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Όνομα κλάσης"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Α&φηρημένη κλάση"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Αρχείο ενσωμάτωσης</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Αφη&ρημένη περίπτωση χρήσης"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Δημιουργία έργου"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Εκτελέσιμο"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Δημιουργία εγγράφου κατασκευής ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Σχεδίαση ως"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Αυτόματη δημιουργία μεθόδων"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Προκαθορισμένο"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Κενές μέθοδοι κατασκευής"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Γέμισμα:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Συσχέτιση μεθόδων πρόσβασης"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Βιβλιοθήκη"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Χαρακτηρισμός μεθόδων πρόσβασης"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+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 "Δημόσιο"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+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 "Προσωπικό"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+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 "Προστατευμένο"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "Ι&διωτικό"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Από το γονικό αντικείμενο"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Προσ&τατευμένο"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Προκαθορισμένη εμβέλεια μεθόδου πρόσβασης:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Υλο&ποίηση"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Προκαθορισμένη εμβέλεια πεδίου συσχέτισης:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Όνομα κλάσης:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Από το ρόλο του γονέα"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Όνομα αντιγράφου:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Δημιουργία κώδικα Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Σχεδίαση ως δράστης"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Άγκιστρο (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Πολλαπλή αντιγραφή"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Αρχή-Τέλος (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Εμφάνιση καταστροφής"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Δημιουργία κώδικα Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Όνομα συστατικού:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Όνομα κόμβου:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
+msgstr ""
+"Το όνομα που επιλέξατε\n"
+"χρησιμοποιείται ήδη.\n"
+"Το όνομα επανήλθε στο παλιό."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Το όνομα δεν είναι μοναδικό"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Χαρακτηριστικά"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Νέο χαρακτηριστικό..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Λειτουργίες"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Νέα &λειτουργία..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Πρότυπα"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Νέο &πρότυπο..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Αρίθμηση ορισμών"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Νέ&α αρίθμηση ορισμών..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Χαρακτηριστικά οντότητας"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Νέο χαρα&κτηριστικό οντότητας..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Διαγραφή αγκίστρωσης"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Ιδιότητες"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Εμφάνιση"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Λειτουρ&γίες"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Ορατότητα"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Υ&πογραφή λειτουργίας"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Πα&κέτο"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Χα&ρακτηριστικά"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Στερεό&τυπα"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Υπο&γραφή χαρακτηριστικού"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Σχεδίαση ως κύκλο"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Εμφάνιση"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Επιλογές εμφάνισης"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Ρυθμίσεις χαρακτηριστικών"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Ρυθμίσεις λειτουργιών"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Ρυθμίσεις προτύπων"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Ρυθμίσεις αριθμήσεων όρων"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Ρυθμίσεις χαρακτηριστικών οντότητας"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Περίληψη"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Ρυθμίσεις περιεχομένων"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Συσχετίσεις κλάσεων"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "νέα_κλάση"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Νέα κλάση"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Χαρακτηριστικά κλάσης"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Λειτουργίες κλάσης"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Επιλογές δημιουργίας κώδικα"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Γλώσσα"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Δημιουργία"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Φάκελοι"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Τερματισμός"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Εγγραφή όλων των δημιουργημένων αρχείων στο φάκελο:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Δημιουργήθηκε κώδικας"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Ε&ξερεύνηση..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Δε δημιουργήθηκε"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Εξε&ρεύνηση..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Δε δημιουργήθηκε ακόμη"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "Ε&νσωμάτωση αρχείων επικεφαλίδας από το φάκελο:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Ο φάκελος %1 δεν υπάρχει. Επιθυμείτε να το δημιουργήσετε τώρα;"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Τα αρχεία που κατασκευάστηκαν από το δημιουργό κώδικα θα γραφτούν σε αυτόν το "
-"φάκελο"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Ο φάκελος εξόδου δεν υπάρχει"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Δημιουργία φακέλου"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Να μη δημιουργηθεί"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Τα αρχεία αυτού του φακέλου θα χρησιμοποιηθούν ως επικεφαλίδες στο "
-"δημιουργημένο κώδικα"
+"Αδυναμία δημιουργίας του φακέλου.\n"
+"Παρακαλώ σιγουρευτείτε ότι έχετε δικαιώματα εγγραφής στο γονικό φάκελο ή "
+"επιλέξτε κάποιον άλλο, έγκυρο φάκελο."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Πολιτική αντικατάστασης"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Σφάλμα δημιουργίας φακέλου"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Παρακαλώ επιλέξτε έναν έγκυρο φάκελο."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Αν ένα αρχείο με όνομα ίδιο με το όνομα που ο δημιουργός\n"
-"κώδικα θέλει να χρησιμοποιήσει ως αρχείο εξόδου υπάρχει ήδη:"
+"Ο φάκελος εξόδου υπάρχει, αλλά δε μπορεί να γραφτεί.\n"
+"Παρακαλώ ορίστε τα κατάλληλα δικαιώματα ή επιλέξτε κάποιον άλλο φάκελο."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Α&ντικατάσταση"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "Αντικατάσταση των υπάρχοντων αρχείων αν υπάρχουν στο φάκελο προορισμού"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr ""
+"Ο %1 δε φαίνεται να είναι ένας φάκελος. Παρακαλώ επιλέξτε έναν έγκυρο φάκελο."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Ερώτηση"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Παρακαλώ επιλέξτε έναν έγκυρο φάκελο"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Αν ένα αρχείο με το ίδιο όνομα υπάρχει ήδη, να γίνει ερώτηση"
+msgid "Code Viewer"
+msgstr "Προβολέας κώδικα"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Χρήση διαφορετικού ονόματος"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Χωρίς διαθέσιμες επιλογές.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Διαγράμματα"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Μορφοποίηση"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Φίλτρο"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Γραμμές"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Τρέχον διάγραμμα"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Στυλ τέλους γραμμής:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Ό&λα τα διαγράμματα"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Τύπος χρήσης εσοχών:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Επιλογή διαγραμμάτων"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Ποσότητα χρήσης εσοχών:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Τύπος διαγράμματος"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Επιλογή"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Περίπτωση χρήσης"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Συνεργασία"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Χωρίς εσοχές"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Ακολουθία"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Στηλοθέτης"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Κατάσταση"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Κενό"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Συστατικό"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Βαθμός μηνυμάτων"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Ετοιμασία"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-διάγραμμα"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Δεν επιλέχθηκαν διαγράμματα."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Η μορφή στην οποία θα εξαχθεί η εικόνα"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Σημείωση τεκμηρίωσης"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Το αρχείο προορισμού υπάρχει ήδη"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Γραφή σχολίων τμημάτων ακόμη και &για κενά \n"
-"τμήματα"
+"Το αρχείο %1 υπάρχει ήδη στο %2.\n"
+"\n"
+"Το Umbrello μπορεί να αντικαταστήσει το αρχείο, να δημιουργήσει ένα "
+"παρόμοιο\n"
+"όνομα αρχείου ή να μη δημιουργήσει αυτό το αρχείο."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Εφαρμογή σε όλα τα εναπομείναντα αρχεία"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Αντικατάσταση"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Δημιουργία παρόμοιου ονόματος αρχείου"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Να μη δημιουργηθεί αρχείο"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Ιδιότητες παραμέτρων"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Τύπος:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "Ό&νομα:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Α&ρχική τιμή:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Κατεύθυνση αποστολής"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"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 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Γραφή σχολίων τεκμηρίωσης ακόμη και για κενά"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr ""
-"Γραφή σχολίων τεκμηρίωσης για &κλάσεις και μεθόδους ακόμη και αν είναι κενές"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Επιλογή λειτουργίας"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Επιλογές γλώσσας"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Αριθμός ακολουθίας:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Μάγος δημιουργίας κώδικα"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Λειτουργία κλάσης:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Επιλογή κλάσεων"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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:30
+msgid "Umbrello Setup"
+msgstr "Ρύθμιση Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Περιβάλλον χρήστη"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Ρυθμίσεις περιβάλλοντος χρήστη"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Χρώμα γραμμής:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Προ&καθορισμένο χρώμα"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Χρώμα γεμίσματος:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Προκα&θορισμένο χρώμα"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Πλάτος γραμμής:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Προκ&αθορισμένο πλάτος"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "Χ&ρήση χρώματος γεμίσματος"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Τοποθετήστε όλες τις κλάσεις για τις οποίες επιθυμείτε τη δημιουργία\n"
-"κώδικα στη δεξιά πλευρά της λίστας"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Προσθήκη κλάσης για δημιουργία κώδικα"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Ενεργοποίηση αναίρεσης"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Επιλεγμένες κλάσεις"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Χρήση διαγραμμάτων σε καρτέλες"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Αφαίρεση κλάσης από τη δημιουργία κώδικα"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Χρήση νέων δημιουργών C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Διαθέσιμες κλάσεις"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Χρήση γραμμών γωνιακής συσχέτισης"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Κατάσταση δημιουργίας κώδικα"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Αυτόματη αποθήκευση"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Πατήστε το κουμπί δημιουργίας για την εκκίνηση της δημιουργίας κώδικα"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Ε&νεργοποίηση αυτόματης αποθήκευσης"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Κατάσταση δημιουργίας"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Επιλογή χρονικού διαστήματος αυτόματης αποθήκευσης (λεπτά):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Προβολέας κώδικα"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Ορισμός κατάληξης αυτόματης αποθήκευσης:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Εμφάνιση κρυμμένων τμημάτων"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Το αρχείο αυτόματης αποθήκευσης θα ονομαστεί ~/autosave.xmi αν δεν "
+"έχετε ακόμη αποθηκεύσει το αρχείο.</p><p>Αν το έχετε ήδη αποθηκεύσει, το "
+"αρχείο αυτόματης αποθήκευσης θα γραφτεί στον ίδιο φάκελο, και θα πάρει το "
+"ίδιο όνομα και κατάληξη αυτή που καθορίζεται εδώ.</p><p>Αν η κατάληξη είναι "
+"ίδια με αυτήν του αρχείου που έχετε αποθηκεύσει, η αυτόματη αποθήκευση θα "
+"αντικαταστήσει το αρχείο αυτομάτως.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">όνομα συστατικού εδώ</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Εκκίνηση"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Εμφάνιση τύπου τμήματος"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Λο&γότυπο εκκίνησης"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Χρώματα"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Συμβουλή της ημέρας"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Γραμματοσειρά:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Φόρτωση τελευταίου έργου"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Χαρτί:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Εκκίνηση νέου έργου με:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Επιλεγμένα:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Χωρίς διάγραμμα"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">τμήμα αντικειμένου UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Διάγραμμα κλάσεων"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Κρυμμένο τμήμα:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Διάγραμμα περιπτώσεων χρήσης"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Κείμενο χωρίς επεξεργασία:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Διάγραμμα ακολουθίας"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Κείμενο με επεξεργασία:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Διάγραμμα συνεργασίας"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Ιδιότητες διαγράμματος"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Διάγραμμα κατάστασης"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Όνομα:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Διάγραμμα δραστηριοτήτων"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Εστίαση:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Διάγραμμα συστατικών"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Διάγραμμα ετοιμασίας"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Ρυθμίσεις κλάσης"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Εμφάνιση &ορατότητας"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Εμφάνιση χαρακτηριστικών"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Εμφάνιση λειτουργιών"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Εμφάνιση στερεό&τυπου"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Εμφάνιση υπογραφής χαρακτηριστικού"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Εμφάνιση πακέτου"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Εμφάνιση υπογραφής λειτουργίας"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Εμφάνιση &πλέγματος"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Εκκίνηση εμβέλειας"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Προσαρμογή σ&το πλέγμα"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Προκαθορισμένη εμβέλεια χαρακτηριστικού:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Προσαρμογή μεγέθους συστατικού"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+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."
-msgstr ""
-"Προσαρμογή του μεγέθους των συστατικών έτσι ώστε να είναι πολλαπλάσιο του "
-"διαστήματος πλέγματος.\n"
-"Αν είναι ενεργοποιημένη η 'Προσαρμογή στο πλέγμα' ένα συστατικό θα είναι πάντα "
-"στοιχισμένο με το πλέγμα και στις 4 πλευρές."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Δημιουργία κώδικα"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Διάστιχο πλέγματος:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Ρυθμίσεις δημιουργίας κώδικα"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "Χ"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Ρυθμίσεις προβολής κώδικα"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Υ"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Αρχική κατάσταση"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Πλάτος γραμμής:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Τελική κατάσταση"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Εξαγωγή όλων των προβολών"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Τύπος κατάστασης:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Κατάλογος αποθήκευσης των διαγραμμάτων:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+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"
-msgstr ""
-"Ο βασικός κατάλογος που θα χρησιμοποιηθεί για την αποθήκευση των εικόνων. Ο "
-"βασικός κατάλογος που θα χρησιμοποιηθεί για την αποθήκευση των εικόνων"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Χρώμα γραφικού συστατικού"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Τύπος ε&ικόνας:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+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"
-msgstr "Η μορφή στην οποία θα εξαχθεί η εικόνα"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Εμ&βέλεια κατηγοριοποιητή (\"στατικό\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Χρήση &φακέλων"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Δημόσιο"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Δημιουργία στον κατάλογο προορισμού της ίδιας δενδρικής δομής που\n"
-"χρησιμοποιήθηκε στο έγγραφο για την αποθήκευση των προβολών"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Προστατευ&μένο"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "Υ&λοποίηση"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Εισάγατε ένα μη έγκυρο όνομα χαρακτηριστικού."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Μη έγκυρο όνομα χαρακτηριστικού"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"Οι προβολές αποθηκεύονται σε φακέλους στο έγγραφο. Με την ενεργοποίηση αυτής "
-"της επιλογής, θα δημιουργηθεί στον επιλεγμένο βασικό κατάλογο η ίδια δενδρική "
-"δομή που χρησιμοποιείται στο έγγραφο για την αποθήκευση των προβολών.\n"
-"Μόνο οι φάκελοι που φτιάχτηκαν από το χρήστη θα δημιουργηθούν στο βασικό "
-"κατάλογο (Η λογική προβολή, η περίπτωση χρήσης κλπ. δε θα δημιουργηθούν)."
+"Το όνομα χαρακτηριστικού που επιλέξατε χρησιμοποιείται ήδη σε αυτήν τη "
+"λειτουργία."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Ιδιότητες ρόλου"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute 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:"
-msgstr "Όνομα ρόλου:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Ιδιότητες χαρακτηριστικού οντότητας"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Πολλαπλότητα:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Προκαθορισμένη τιμή:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Προσαρμοστικότητα ρόλου"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Μήκος/Τιμές:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Μόνο προσθήκη"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Αυτόματη αύξηση"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Παγιωμένο"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Να επιτρέπεται το &κενό"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Προσαρμοστικό"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Χαρακτηριστικά:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Ορατότητα ρόλου"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Δημιουργία ευρετηρίου"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Υλοποίηση"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+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"
-msgstr ""
-"<p>Καλώς ήρθατε στο Umbrello.</p>\n"
-"<p>Τα διαγράμματα UML σας επιτρέπουν να σχεδιάσετε και να τεκμηριώσετε "
-"λογισμικό αντικειμενοστραφούς προγραμματισμού.  <a href=\"help:/umbrello\">"
-"Το εγχειρίδιο Umbrello</a> είναι μια καλή εισαγωγή στη χρήση της UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Πρωτεύον"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Καλώς ήρθατε στο Umbrello 1.5.  Νέα σε αυτή την έκδοση είναι οι κλάσεις "
-"συσχέτισης,  η δημιουργία κώδικα Ruby, η εξαγωγή φακέλων, η δυνατότητα αλλαγής "
-"των διασυνδέσεων σε κλάσεις, και άλλα ακόμη.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Ευρετήρ&ιο"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Τα διαγράμματα σε καρτέλες και οι εξαγόμενοι φάκελοι είναι "
-"αλληλοαναιρούμενοι. Αν χρειάζεστε τους εξωτερικούς φακέλους θα πρέπει να "
-"αποεπιλέξετε τη &quot;Χρήση διαγραμμάτων σε καρτέλες&quot; στις γενικές "
-"ρυθμίσεις.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&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"
-msgstr ""
-"<p>Τα περισσότερα αντικείμενα διαγραμμάτων δε μπορούν να αλλάξουν μέγεθος, θα "
-"αλλάξουν μέγεθος μόνα τους για να χωρέσει το περιεχόμενό τους.\n"
-"Τα πλαίσια, οι σημειώσεις, και τα μηνύματα διαγράμματος ακολουθίας μπορούν να "
-"αλλάξουν μέγεθος, απλά με ένα κλικ και σύρσιμο στο κόκκινο τετράγωνο.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Εισάγατε ένα μη έγκυρο όνομα χαρακτηριστικού οντότητας."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Αν επιθυμείτε να προσθέσετε μια υπάρχουσα κλάση σε ένα διάγραμμα, απλά "
-"σύρετε την καταχώρησή της από την προβολή δέντρου.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Μη έγκυρο όνομα χαρακτηριστικού οντότητας"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Ο βοηθός μεταποίησης του Umbrello σας επιτρέπει να μετακινείτε λειτουργίες "
-"μεταξύ μιας κλάσης και των βασικών και απογόνων\n"
-"κλάσεων.\n"
-"Δεξί κλικ σε μια κλάση για το άνοιγμα του βοηθού μεταποίησης.</p>\n"
+"Το όνομα χαρακτηριστικού οντότητας που επιλέξατε χρησιμοποιείται ήδη σε "
+"αυτήν τη λειτουργία."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Τα αντικείμενα διαγραμμάτων ακολουθίας μπορούν να έχουν ένα πλαίσιο "
-"καταστροφέα και να σχεδιάζονται ως δράστες.  Κάντε διπλό κλικ σε ένα, για\n"
-"το διάλογο ιδιοτήτων.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name 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"
-msgstr ""
-"<p>Τα μηνύματα διαγραμμάτων ακολουθίας μπορούν να δράσουν ως κατασκευαστές.  "
-"Κάντε κλικ στο πλαίσιο του αντικειμένου (αντί της κατακόρυφης γραμμής) για να "
-"τα κάνετε κατασκευαστές.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Ιδιότητες λειτουργίας"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Τα διαγράμματα ακολουθιών υποστηρίζουν μηνύματα στον εαυτό τους.  Κάντε κλικ "
-"στην ίδια κατακόρυφη γραμμή ξανά για τη δημιουργία ενός αυτόματου μηνύματος.</p>"
-"\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Α&φηρημένη λειτουργία"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Αν κατά τη φόρτωση ενός ξένου αρχείου δεν εμφανίζεται τίποτα στη προβολή "
-"λίστας, δοκιμάστε να αποθηκεύσετε το μοντέλο με διαφορετικό όνομα,\n"
-"να το κλείσετε, και να φορτώσετε ξανά το αποθηκευμένο αρχείο. Συνήθως έπειτα "
-"από αυτό η προβολή λίστας συμπληρώνεται σωστά.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Ερώτημα (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Η αποκοπή και αντιγραφή θα εξάγουν επίσης την εικόνα σε πρόχειρο PNG το "
-"οποίο μπορεί να επικολληθεί στο KWord\n"
-"και σε άλλες εφαρμογές.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Παράμετροι"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Οι συσχετίσεις δε χρειάζεται να βρίσκονται σε ευθείες γραμμές, κάνοντας "
-"διπλό κλικ σε μία, θα δημιουργηθεί ένα σημείο που μπορεί να κινηθεί.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "&Νέα παράμετρος..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Μπορείτε να ενεργοποιήσετε την αυτόματη αποθήκευση στο διάλογο ρύθμισης του "
-"Umbrello.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Εισάγατε ένα μη έγκυρο όνομα παραμέτρου."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Λείπει κάποιο χαρακτηριστικό που χρειάζεστε στο Umbrello; Παρακαλώ "
-"ενημερώστε μας. \n"
-"Μπορείτε είτε να το προσθέσετε στη βάση δεδομένων σφαλμάτων με την αναφορά "
-"σφάλματος από το μενού βοήθειας\n"
-"είτε να το στείλετε στη λίστα ηλεκτρονικού ταχυδρομείου uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Μη έγκυρο όνομα παραμέτρου"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Μπορείτε να διαγράψετε όλα τα επιλεγμένα αντικείμενα πατώντας το Del ή το "
-"Backspace.</p>\n"
+"Το όνομα παραμέτρου που επιλέξατε\n"
+"χρησιμοποιείται ήδη σε αυτήν τη λειτουργία."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Αν βρήκατε κάποιο σφάλμα στο Umbrello, παρακαλώ ενημερώστε μας. \n"
-"Μπορείτε να καταχωρήσετε σφάλματα με το εργαλείο αναφοράς σφάλματος στο μενού "
-"βοήθειας.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Το όνομα παραμέτρου δεν είναι μοναδικό"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Πατώντας το πλήκτρο Escape ορίζεται τρέχον εργαλείο το εργαλείο επιλογής.\n"
-"Το Backspace μεταβαίνει στο προηγούμενο εργαλείο που χρησιμοποιήθηκε.</p>\n"
+"Το όνομα παραμέτρου που επιλέξατε χρησιμοποιείται ήδη από αυτήν τη "
+"λειτουργία."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Εισάγατε ένα μη έγκυρο όνομα λειτουργίας."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Μη έγκυρο όνομα λειτουργίας"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Μια λειτουργία με αυτή την υπογραφή υπάρχει ήδη στο %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Επιλέξτε ένα διαφορετικό όνομα ή λίστα παραμέτρων."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Ιδιότητες ρόλου"
 
-#: tips.txt:103
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Ιδιότητες προτύπου"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Εισάγατε ένα μη έγκυρο όνομα προτύπου."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Μη έγκυρο όνομα προτύπου"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Μπορείτε να επιλέξετε όλα τα αντικείμενα πατώντας Ctrl-A.</p>\n"
+"Το όνομα παραμέτρου προτύπου που επιλέξατε χρησιμοποιείται ήδη σε αυτήν τη "
+"λειτουργία."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Το όνομα προτύπου δεν είναι μοναδικό"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Επιλογές εμφάνισης κλάσεων"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Χρώματα διαγράμματος"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Το όνομα που εισάγατε δεν είναι έγκυρο."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Το όνομα που εισάγατε δεν είναι μοναδικό."
 
-#: tips.txt:108
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Μη μοναδικό όνομα"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Γραμμή:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Γέμισμα:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Προ&καθορισμένο"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Χρήση γεμίσματος"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Εξαγωγή όλων των προβολών..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+msgstr "Υπήρξε ένα πρόβλημα κατά την αποθήκευση του αρχείου: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Σφάλμα αποθήκευσης"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Αυτόνομη γεννήτρια κώδικα του μοντελοποιητή Umbrello UML"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Αρχείο για μετασχηματισμό"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Το αρχείο XSLT που θα χρησιμοποιηθεί"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Μπορείτε να δημιουργήσετε και να ρυθμίσετε μια νέα κλάση χρησιμοποιώντας το "
-"μάγο νέας κλάσης στο μενού κώδικα.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 οι συγγραφείς του "
+"Μοντελοποιητή Umbrello UML"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Συγγραφείς μοντελοποιητή Umbrello UML"
+
+#: 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 "Όνομα"
+
+#: 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 "Εισαγωγή ονόματος:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Εισαγωγή ονόματος λειτουργίας:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Εισαγωγή νέου κειμένου:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ΣΦΑΛΜΑ"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Αλλαγή κειμένου"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Το αρχείο φάκελος %1 δεν υπάρχει."
+
+#: 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 "Σφάλμα φόρτωσης"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Το αρχείο φάκελος %1 δε μπορεί να ανοιχτεί."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1705,6 +1827,10 @@ msgstr "Νέα λειτουργία..."
 msgid "Select Operation..."
 msgstr "Επιλογή λειτουργίας..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Αλλαγή κειμένου..."
@@ -1756,6 +1882,19 @@ msgstr "Νέο"
 msgid "Rename..."
 msgstr "Μετονομασία..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Σφάλμα επικόλλησης"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Χρώμα γραμμής..."
@@ -1784,14 +1923,26 @@ msgstr "Εισαγωγή φακέλου"
 msgid "Import Classes..."
 msgstr "Εισαγωγή κλάσεων..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Πακέτο"
+
 #: 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 "Κόμβος"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Διάγραμμα ετοιμασίας..."
@@ -1800,10 +1951,18 @@ msgstr "Διάγραμμα ετοιμασίας..."
 msgid "Folder"
 msgstr "Φάκελος"
 
+#: 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 "Διάγραμμα περίπτωσης χρήσης..."
@@ -1840,6 +1999,18 @@ msgstr "Νέο χαρακτηριστικό οντότητας..."
 msgid "Export as Picture..."
 msgstr "Εξαγωγή ως εικόνα..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Διασύνδεση"
+
+#: 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 "Διάγραμμα κλάσης..."
@@ -1860,26 +2031,10 @@ msgstr "Διάγραμμα ακολουθίας..."
 msgid "Collaboration Diagram..."
 msgstr "Διάγραμμα συνεργασίας..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Χαρακτηριστικά"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Λειτουργίες"
-
 #: 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 "Υπογραφή λειτουργίας"
@@ -1892,11 +2047,6 @@ msgstr "Υπογραφή χαρακτηριστικού"
 msgid "Stereotype"
 msgstr "Στερεότυπο"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Εμφάνιση"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Χαρακτηριστικό..."
@@ -1921,14 +2071,6 @@ msgstr "Χρώμα γεμίσματος..."
 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 "Χρώμα"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Δράστης..."
@@ -1957,10 +2099,26 @@ msgstr "Αρίθμηση..."
 msgid "Package..."
 msgstr "Πακέτο..."
 
+#: 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 "Κατάσταση..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Αρχική δραστηριότητα"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Τελική δραστηριότητα"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Υποσύστημα..."
@@ -2005,6 +2163,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 "Καθαρισμός διαγράμματος"
@@ -2039,8 +2205,8 @@ 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 ""
 "διατήρηση της δενδρικής δομής που χρησιμοποιείται για την αποθήκευση των "
 "προβολών στο έγγραφο στον κατάλογο προορισμού"
@@ -2048,194 +2214,99 @@ msgstr ""
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
-"(c) 2001 Paul Hensgen, (c) 2002-2006 οι συγγραφείς του Μοντελοποιητή Umbrello "
-"UML"
-
-#: 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 "Το αρχείο φάκελος %1 δεν υπάρχει."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Το αρχείο φάκελος %1 δε μπορεί να ανοιχτεί."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Σπύρος Γεωργαράς,Τούσης Μανώλης"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sng@hellug.gr,manolis@koppermind.homelinux.org"
-
-#: 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 "Έτοιμο."
-
-#: 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 ""
-"Κρατήστε πατημένο το shift ή το ctrl για να μετακινηθείτε στον άξονα Χ. "
-"Κρατήστε πατημένο το shift και το ctrl για να μετακινηθείτε στον άξονα Y. Κάντε "
-"κλικ με το δεξί πλήκτρο του ποντικιού για ακύρωση."
+"(c) 2001 Paul Hensgen, (c) 2002-2006 οι συγγραφείς του Μοντελοποιητή "
+"Umbrello UML"
 
-#: 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 ""
-"Κρατήστε πατημένο το shift ή το ctrl για να μετακινηθείτε στον άξονα Χ. "
-"Κρατήστε πατημένο το shift και το ctrl για να μετακινηθείτε στον άξονα Y. Κάντε "
-"κλικ με το δεξί πλήκτρο του ποντικιού για να ακυρώσετε την αλλαγή μεγέθους."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Η εμβέλεια %1 είναι ένας χώρος ονομάτων ή μια κλάση;"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Η εισαγωγή C++ ζητά τη βοήθειά σας"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Χώρος ονομάτων"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Εισαγωγή αρχείου: %1 Πρόοδος: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Εσωτερικό σφάλμα"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Συντακτικό σφάλμα πριν το '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Σφάλμα ανάλυσης πριν το '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<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"
-msgstr "αναμενόταν έκφραση"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "νέα_περίπτωσηχρήσης"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Συντακτικό σφάλμα δήλωσης"
+#: 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"
-msgstr "αναμενόταν }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "νέο_συστατικό"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "αναμενόταν χώρος ονομάτων"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "νέος_κόμβος"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "αναμενόταν {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "νέο_δημιούργημα"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Αναμενόταν όνομα χώρου ονομάτων"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "νέα_διασύνδεση"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Χρειάζεται δήλωση ορισμού τύπου"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "νέος_τύποςδεδομένων"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "αναμενόταν μια δήλωση"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "νέα_αρίθμηση"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Αναμενόταν σταθερή έκφραση"
+#: 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
+msgid "new_folder"
+msgstr "νέος_φάκελος"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "λείπει }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "νέα_συσχέτιση"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Αναμένονταν αρχικοποιητές μελών"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "νέο_αντικείμενο"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Αναμενόταν ορισμός βασικής κλάσης"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Αναμενόταν πρόταση αρχικοποίησης"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Κενό"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Αναμενόταν προσδιορισμός"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Κακώς ορισμένη παράμετρος"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Αναμενόταν ταυτότητα τύπου"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Άγνωστος τύπος παραμέτρου"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Αναμενόταν όνομα κλάσης"
+#: 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"
-msgstr "αναμενόταν συνθήκη"
+#: 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"
-msgstr "αναμενόταν δήλωση"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Απροσδιόριστο σφάλμα"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "αναμενόταν αρχικοποίηση for"
+#: 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"
-msgstr "αναμενόταν catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Χρησιμοποιημένη λέξη"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2249,107 +2320,66 @@ msgstr "Εισαγωγή ονόματος αντικειμένου:"
 msgid "new_parameter"
 msgstr "νέα_παράμετρος"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Γενικές επιλογές"
-
-#: 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"
-msgstr "Διάγραμμα: %2 Σελίδα %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Εισαγωγή ονόματος διαγράμματος"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Προσθήκη βασικής κλάσης"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Εισαγωγή του νέου ονόματος διαγράμματος:"
+#: 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?"
-msgstr ""
-"Πρόκειται να διαγράψετε ολόκληρο το διάγραμμα.\n"
-"Είστε σίγουροι;"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Προσθήκη λειτουργίας"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Διαγραφή διαγράμματος;"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Προσθήκη χαρακτηριστικού"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Η μετονομασία ακυρώθηκε"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Προσθήκη βασικής διασύνδεσης"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Η μετονομασία ενός αντικειμένου της προβολής λίστας με τύπο %1 δεν έχει "
-"υλοποιηθεί ακόμα."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Προσθήκη απογόνου διασύνδεσης"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Η συνάρτηση δεν έχει υλοποιηθεί"
+#: 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."
-msgstr ""
-"Το όνομα που εισάγατε δεν ήταν έγκυρο.\n"
-"Η διεργασία μετονομασίας ακυρώθηκε."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Απόγονοι κατηγοριοποιητές"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "νέα_συσχέτιση"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Εισαγωγή ονόματος κατάστασης"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "νέο_χαρακτηριστικό"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Εισαγωγή ονόματος της νέας κατάστασης:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "νέο_πρότυπο"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Εισαγωγή δραστηριότητας"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "νέα_λειτουργία"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Εσφαλμένη χρήση των συσχετίσεων."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "νέος_ορισμός"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Σφάλμα συσχέτισης"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "νέο_πεδίο"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "νέα κατάσταση"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2503,11 +2533,6 @@ msgstr "Ε&ξαγωγή ως εικόνα..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Εξαγωγή ό&λων των διαγραμμάτων ως εικόνες..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Ιδιότητες"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Κύλιση εστίασης"
@@ -2592,21 +2617,28 @@ msgstr "&Τεκμηρίωση"
 msgid "Opening file..."
 msgstr "Άνοιγμα αρχείου..."
 
+#: 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 "Δημιουργία νέου εγγράφου..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Όλα τα υποστηριζόμενα αρχεία (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Όλα τα υποστηριζόμενα αρχεία (*.xmi, *."
+"xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Ασυμπίεστα αρχεία XMI (*.xmi)\n"
 "*.xmi.tgz|Gzip συμπιεσμένα αρχεία XMI (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 συμπιεσμένα αρχεία XMI (*.xmi.tar.bz2)"
@@ -2635,6 +2667,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 συμπιεσμένο αρχείο XMI\n"
 "*|Όλα τα αρχεία"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2643,6 +2679,10 @@ msgstr ""
 "Το αρχείο %1 υπάρχει.\n"
 "Επιθυμείτε την αντικατάστασή του;"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
@@ -2678,8 +2718,8 @@ msgstr "Εισαγωγή περιεχομένων πρόχειρου..."
 
 #: 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 ""
 "Το Umbrello δε μπόρεσε να επικολλήσει τα περιεχόμενα του πρόχειρου.  Τα "
 "αντικείμενα στο πρόχειρο μπορεί να είναι λάθος τύπου για την επικόλλησή τους "
@@ -2738,1269 +2778,1333 @@ msgstr "Όλα τα αρχεία"
 msgid "Select Code to Import"
 msgstr "Επιλογή κώδικα για εισαγωγή"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Ό&νομα κλάσης:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Όνομα &δράστη:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "νέο_χαρακτηριστικό"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Όνομα &πακέτου:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "νέο_πρότυπο"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Όνομα περίπτωσης &χρήσης:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "νέα_λειτουργία"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Όνομα &διασύνδεσης:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "νέος_ορισμός"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Όνομα συ&στατικού:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "νέο_πεδίο"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Όνομα δη&μιουργήματος:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Μοντέλο UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Όνομα αρί&θμησης:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Λογική προβολή"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Όνομα τύπου δε&δομένων:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Προβολή περιπτώσεων χρήσης"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Όνομα ον&τότητας:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Προβολή συστατικών"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Ό&νομα στερεότυπου:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Προβολή ετοιμασίας"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Όνομα &πακέτου:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Μοντέλο σχέσεων οντότητας"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Α&φηρημένη κλάση"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Τύποι δεδομένων"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Αφη&ρημένη περίπτωση χρήσης"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Το τρέχον αρχείο έχει τροποποιηθεί.\n"
+"Επιθυμείτε να το αποθηκεύσετε;"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Εκτελέσιμο"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Το αρχείο %1 δεν υπάρχει."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Σχεδίαση ως"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Το αρχείο %1 μοιάζει να είναι χαλασμένο."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Προκαθορισμένο"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Δε βρέθηκε αρχείο XMI στο συμπιεσμένο αρχείο %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Βιβλιοθήκη"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Υπήρξε ένα πρόβλημα κατά τη φόρτωση του εξαγόμενου αρχείου: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Πίνακας"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Υπήρξε ένα πρόβλημα κατά τη φόρτωση του αρχείου: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "Δη&μόσιο"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Υπήρξε ένα πρόβλημα κατά την ενημέρωση του αρχείου: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "Ι&διωτικό"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "διάγραμμα περίπτωσης χρήσης"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Προσ&τατευμένο"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "διάγραμμα κλάσης"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Υλο&ποίηση"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "διάγραμμα ακολουθίας"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Όνομα κλάσης:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "διάγραμμα συνεργασίας"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Όνομα αντιγράφου:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "διάγραμμα κατάστασης"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Σχεδίαση ως δράστης"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "διάγραμμα δραστηριότητας"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Πολλαπλή αντιγραφή"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "διάγραμμα συστατικού"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Εμφάνιση καταστροφής"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "διάγραμμα ετοιμασίας"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Όνομα συστατικού:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "διάγραμμα σχέσεων οντότητας"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Όνομα κόμβου:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Αυτό είναι ένα μη έγκυρο όνομα διαγράμματος."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Όνομα στερεότυπου:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Ένα διάγραμμα χρησιμοποιεί ήδη αυτό το όνομα."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Το όνομα που επιλέξατε\n"
-"χρησιμοποιείται ήδη.\n"
-"Το όνομα επανήλθε στο παλιό."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Το όνομα δεν είναι μοναδικό"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Γραμμή:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Γέμισμα:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Προ&καθορισμένο"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Χρήση γεμίσματος"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Δραστηριότητες"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Νέα δραστηριότητα..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Μετονομασία"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Νέα δραστηριότητα"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Μετονομασία δραστηριότητας"
+"Το όνομα που εισάγατε δεν ήταν μοναδικό.\n"
+"Είναι αυτό που επιθυμείτε;"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Εισάγετε το νέο όνομα της δραστηριότητας:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Χρήση ονόματος"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Ιδιότητες συσχέτισης"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+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 "Γενικές ρυθμίσεις"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Είστε σίγουροι ότι επιθυμείτε τη διαγραφή του διαγράμματος %1;"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Ρόλοι"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Διαγραφή διαγράμματος"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Ρυθμίσεις ρόλων"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+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 "Ρυθμίσεις γραμματοσειράς"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Επίλυση αναφορών αντικειμένων..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Γραμματοσειρά συσχέτισης"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Φόρτωση στοιχείων UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Ιδιότητες προτύπου"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+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 "Γενικές ιδιότητες"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/αυτόματηαποθήκευση%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Τύπος:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Εξαγωγή φακέλου"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "Ό&νομα:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Εισάγετε όνομα μοντέλου"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Εισάγατε ένα μη έγκυρο όνομα προτύπου."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Εισάγετε το νέο όνομα του μοντέλου:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Μη έγκυρο όνομα προτύπου"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Προβολές"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter 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/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Το όνομα προτύπου δεν είναι μοναδικό"
+"Το όνομα που εισάγατε ήταν μη έγκυρο.\n"
+"Η διεργασία δημιουργίας ακυρώθηκε."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Ιδιότητες χαρακτηριστικού οντότητας"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Μη έγκυρο όνομα"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Προκαθορισμένη τιμή:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Το όνομα που εισάγατε δεν ήταν μοναδικό!\n"
+"Η διεργασία δημιουργίας ακυρώθηκε."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Μήκος/Τιμές:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Η δημιουργία ακυρώθηκε"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Αυτόματη αύξηση"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Φόρτωση προβολής λίστας..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Να επιτρέπεται το &κενό"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Ο φάκελος πρέπει να αδειάσει πριν να μπορεί να διαγραφεί."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Χαρακτηριστικά:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Ο φάκελος δεν είναι κενός"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Δημιουργία ευρετηρίου"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Η μετονομασία ακυρώθηκε"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Κανένα"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Η μετονομασία ενός αντικειμένου της προβολής λίστας με τύπο %1 δεν έχει "
+"υλοποιηθεί ακόμα."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Πρωτεύον"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Η συνάρτηση δεν έχει υλοποιηθεί"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Ευρετήρ&ιο"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Το όνομα που εισάγατε δεν ήταν έγκυρο.\n"
+"Η διεργασία μετονομασίας ακυρώθηκε."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Μοναδικό"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Διάγραμμα: %2 Σελίδα %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Εισάγατε ένα μη έγκυρο όνομα χαρακτηριστικού οντότητας."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Εισαγωγή ονόματος διαγράμματος"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Μη έγκυρο όνομα χαρακτηριστικού οντότητας"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Εισαγωγή του νέου ονόματος διαγράμματος:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Το όνομα χαρακτηριστικού οντότητας που επιλέξατε χρησιμοποιείται ήδη σε αυτήν "
-"τη λειτουργία."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Το όνομα χαρακτηριστικού οντότητας δεν είναι μοναδικό"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Εμφάνιση"
+"Πρόκειται να διαγράψετε ολόκληρο το διάγραμμα.\n"
+"Είστε σίγουροι;"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Επιλογές εμφάνισης κλάσεων"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Διαγραφή διαγράμματος;"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Χρώματα διαγράμματος"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Εξαγωγή προβολής..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Το όνομα που εισάγατε δεν είναι έγκυρο."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
+"Παρουσιάστηκε σφάλμα κατά την εξαγωγή της εικόνας:\n"
+"Παρουσιάστηκε ένα σφάλμα κατά την εξαγωγή της εικόνας:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Το όνομα που εισάγατε δεν είναι μοναδικό."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Το επιλεγμένο αρχείο %1 υπάρχει.\n"
+"Επιθυμείτε την αντικατάστασή του;"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Τύπος:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Το αρχείο υπάρχει ήδη"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Ρύθμιση Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Αδύνατη η δημιουργία του φακέλου: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Περιβάλλον χρήστη"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Αδυναμία αποθήκευσης ενός κενού διαγράμματος"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Ρυθμίσεις περιβάλλοντος χρήστη"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του διαγράμματος στο %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Χρώμα γραμμής:"
+#: 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 ""
+"Κρατήστε πατημένο το shift ή το ctrl για να μετακινηθείτε στον άξονα Χ. "
+"Κρατήστε πατημένο το shift και το ctrl για να μετακινηθείτε στον άξονα Y. "
+"Κάντε κλικ με το δεξί πλήκτρο του ποντικιού για ακύρωση."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-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 ""
+"Κρατήστε πατημένο το shift ή το ctrl για να μετακινηθείτε στον άξονα Χ. "
+"Κρατήστε πατημένο το shift και το ctrl για να μετακινηθείτε στον άξονα Y. "
+"Κάντε κλικ με το δεξί πλήκτρο του ποντικιού για να ακυρώσετε την αλλαγή "
+"μεγέθους."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Χρώμα γεμίσματος:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Αντικείμενο"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Προκα&θορισμένο χρώμα"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Σύγχρονο μήνυμα"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Πλάτος γραμμής:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Ασύγχρονο μήνυμα"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Προκ&αθορισμένο πλάτος"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Ετικέτα"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "Χ&ρήση χρώματος γεμίσματος"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Σημείωση"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Ενεργοποίηση αναίρεσης"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Πλαίσιο"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Χρήση διαγραμμάτων σε καρτέλες"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Σχέση"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Χρήση νέων δημιουργών C++/Java/Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Κατευθυντήρια συσχέτιση"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Χρήση γραμμών γωνιακής συσχέτισης"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Υλοποιεί (γενίκευση/πραγματοποίηση)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Αυτόματη αποθήκευση"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Μακρύ ιστορικό"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Ε&νεργοποίηση αυτόματης αποθήκευσης"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Σύντομο ιστορικό"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Επιλογή χρονικού διαστήματος αυτόματης αποθήκευσης (λεπτά):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Σύνδεση"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Ορισμός κατάληξης αυτόματης αποθήκευσης:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Διακλάδωση"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Το αρχείο αυτόματης αποθήκευσης θα ονομαστεί ~/autosave.xmi αν δεν έχετε "
-"ακόμη αποθηκεύσει το αρχείο.</p>"
-"<p>Αν το έχετε ήδη αποθηκεύσει, το αρχείο αυτόματης αποθήκευσης θα γραφτεί στον "
-"ίδιο φάκελο, και θα πάρει το ίδιο όνομα και κατάληξη αυτή που καθορίζεται "
-"εδώ.</p>"
-"<p>Αν η κατάληξη είναι ίδια με αυτήν του αρχείου που έχετε αποθηκεύσει, η "
-"αυτόματη αποθήκευση θα αντικαταστήσει το αρχείο αυτομάτως.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Σύνδεσμος"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Εκκίνηση"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Επιλογή"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Λο&γότυπο εκκίνησης"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Μετάβαση δραστηριότητας"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Συμβουλή της ημέρας"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Μήνυμα"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Φόρτωση τελευταίου έργου"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "ΑΠΡΟΣΔΙΟΡΙΣΤΟ"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Εκκίνηση νέου έργου με:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Επιλογή"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Χωρίς διάγραμμα"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Διάγραμμα κλάσεων"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Διάγραμμα περιπτώσεων χρήσης"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Διάγραμμα ακολουθίας"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Διάγραμμα συνεργασίας"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Εμφάνιση λειτουργιών"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Διάγραμμα κατάστασης"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Διάγραμμα δραστηριοτήτων"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Καθαρισμός διαγράμματος"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Διάγραμμα συστατικών"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Διάγραμμα ετοιμασίας"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Γενίκευση"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Ρυθμίσεις κλάσης"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Εμφάνιση &ορατότητας"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Εμφάνιση χαρακτηριστικών"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Όνομα συσχέτισης"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Εμφάνιση λειτουργιών"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Εμφάνιση στερεό&τυπου"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Εμφάνιση υπογραφής χαρακτηριστικού"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Εμφάνιση πακέτου"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Προκαθορισμένο"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Εκκίνηση εμβέλειας"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Προκαθορισμένη εμβέλεια χαρακτηριστικού:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Κάθετος-Κάθετος (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Προκαθορισμένη εμβέλεια λειτουργίας:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Κάθετος-Αστέρι (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Δημιουργία κώδικα"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Στυλ:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Ρυθμίσεις δημιουργίας κώδικα"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ Δημιουργία Κώδικα</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Ρυθμίσεις προβολής κώδικα"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Δημιουργία σώματος μεθόδου"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Ιδιότητες λειτουργίας"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Χρήση των παρακάτω για τις κλάσεις στο δημιουργημένο κώδικα:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Α&φηρημένη λειτουργία"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Εμ&βέλεια κατηγοριοποιητή (\"στατικό\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Ερώτημα (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Μεταβλητή</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Προστατευ&μένο"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "Υ&λοποίηση"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Παράμετροι"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Νέα παράμετρος..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Αλφαριθμητικό</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Εισάγατε ένα μη έγκυρο όνομα παραμέτρου."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Λίστα</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Μη έγκυρο όνομα παραμέτρου"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Το όνομα παραμέτρου που επιλέξατε\n"
-"χρησιμοποιείται ήδη σε αυτήν τη λειτουργία."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Το όνομα παραμέτρου δεν είναι μοναδικό"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"Το όνομα παραμέτρου που επιλέξατε χρησιμοποιείται ήδη από αυτήν τη λειτουργία."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Όνομα κλάσης"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Εισάγατε ένα μη έγκυρο όνομα λειτουργίας."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Αρχείο ενσωμάτωσης</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Μη έγκυρο όνομα λειτουργίας"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Δημιουργία έργου"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Μια λειτουργία με αυτή την υπογραφή υπάρχει ήδη στο %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Δημιουργία εγγράφου κατασκευής ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Επιλέξτε ένα διαφορετικό όνομα ή λίστα παραμέτρων."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Αυτόματη δημιουργία μεθόδων"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Ιδιότητες ρόλου Α"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Κενές μέθοδοι κατασκευής"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Ιδιότητες ρόλου Β"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Συσχέτιση μεθόδων πρόσβασης"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Ορατότητα ρόλου Α"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Χαρακτηρισμός μεθόδων πρόσβασης"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Ορατότητα ρόλου Β"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Από το γονικό αντικείμενο"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Προσαρμοστικότητα ρόλου Α"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Προκαθορισμένη εμβέλεια μεθόδου πρόσβασης:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Προσαρμοστικότητα ρόλου Β"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Προκαθορισμένη εμβέλεια πεδίου συσχέτισης:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Περιεχόμενα αντικείμενα"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Από το ρόλο του γονέα"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Σημείωση τεκμηρίωσης"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Δημιουργία κώδικα Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Νέο χαρακτηριστικό..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Άγκιστρο (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Νέα &λειτουργία..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Αρχή-Τέλος (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Πρότυπα"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Δημιουργία κώδικα Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Νέο &πρότυπο..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Γλώσσα"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Αρίθμηση ορισμών"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Φάκελοι"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Νέ&α αρίθμηση ορισμών..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Εγγραφή όλων των δημιουργημένων αρχείων στο φάκελο:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Χαρακτηριστικά οντότητας"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Ε&ξερεύνηση..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Νέο χαρα&κτηριστικό οντότητας..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Εξε&ρεύνηση..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Αρχική δραστηριότητα"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "Ε&νσωμάτωση αρχείων επικεφαλίδας από το φάκελο:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Τελική δραστηριότητα"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Τα αρχεία που κατασκευάστηκαν από το δημιουργό κώδικα θα γραφτούν σε αυτόν "
+"το φάκελο"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Τύπος δραστηριότητας:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Τα αρχεία αυτού του φακέλου θα χρησιμοποιηθούν ως επικεφαλίδες στο "
+"δημιουργημένο κώδικα"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Όνομα δραστηριότητας:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Πολιτική αντικατάστασης"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Χρώματα γραφικού συστατικού"
+#: 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 ""
+"Αν ένα αρχείο με όνομα ίδιο με το όνομα που ο δημιουργός\n"
+"κώδικα θέλει να χρησιμοποιήσει ως αρχείο εξόδου υπάρχει ήδη:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Ιδιότητες χαρακτηριστικού"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Α&ντικατάσταση"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Α&ρχική τιμή:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Αντικατάσταση των υπάρχοντων αρχείων αν υπάρχουν στο φάκελο προορισμού"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Δημόσιο"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Ερώτηση"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Εισάγατε ένα μη έγκυρο όνομα χαρακτηριστικού."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Αν ένα αρχείο με το ίδιο όνομα υπάρχει ήδη, να γίνει ερώτηση"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Μη έγκυρο όνομα χαρακτηριστικού"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Χρήση διαφορετικού ονόματος"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Το όνομα χαρακτηριστικού δεν είναι μοναδικό"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Μορφοποίηση"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Επιλογή λειτουργίας"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Γραμμές"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Αριθμός ακολουθίας:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Στυλ τέλους γραμμής:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Λειτουργία κλάσης:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Τύπος χρήσης εσοχών:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Προσαρμοσμένη λειτουργία:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Ποσότητα χρήσης εσοχών:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Διαγράμματα"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Φίλτρο"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Τρέχον διάγραμμα"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Ό&λα τα διαγράμματα"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Χωρίς εσοχές"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Επιλογή διαγραμμάτων"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Στηλοθέτης"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Τύπος διαγράμματος"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Κενό"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Επιλογή"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Βαθμός μηνυμάτων"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Συνεργασία"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Γραφή σχολίων τμημάτων ακόμη και &για κενά \n"
+"τμήματα"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Ακολουθία"
+#: 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Ετοιμασία"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Γραφή σχολίων τεκμηρίωσης ακόμη και για κενά"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Δεν επιλέχθηκαν διαγράμματα."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Γραφή σχολίων τεκμηρίωσης για &κλάσεις και μεθόδους ακόμη και αν είναι κενές"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Επιλογές εμφάνισης"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Επιλογές γλώσσας"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Ρυθμίσεις χαρακτηριστικών"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Μάγος δημιουργίας κώδικα"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Ρυθμίσεις λειτουργιών"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Επιλογή κλάσεων"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Ρυθμίσεις προτύπων"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Τοποθετήστε όλες τις κλάσεις για τις οποίες επιθυμείτε τη δημιουργία\n"
+"κώδικα στη δεξιά πλευρά της λίστας"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Ρυθμίσεις αριθμήσεων όρων"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Προσθήκη κλάσης για δημιουργία κώδικα"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Ρυθμίσεις χαρακτηριστικών οντότητας"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Επιλεγμένες κλάσεις"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Ρυθμίσεις περιεχομένων"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Αφαίρεση κλάσης από τη δημιουργία κώδικα"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Συσχετίσεις"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Διαθέσιμες κλάσεις"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Συσχετίσεις κλάσεων"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Κατάσταση δημιουργίας κώδικα"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Λειτουρ&γίες"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Πατήστε το κουμπί δημιουργίας για την εκκίνηση της δημιουργίας κώδικα"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Ορατότητα"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Κατάσταση δημιουργίας"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Υ&πογραφή λειτουργίας"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Εμφάνιση κρυμμένων τμημάτων"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Πα&κέτο"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">όνομα συστατικού εδώ</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Χα&ρακτηριστικά"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Στερεό&τυπα"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Εμφάνιση τύπου τμήματος"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Υπο&γραφή χαρακτηριστικού"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Χρώματα"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Σχεδίαση ως κύκλο"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Γραμματοσειρά:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Αρχική κατάσταση"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Χαρτί:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Τελική κατάσταση"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Επιλεγμένα:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Τύπος κατάστασης:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">τμήμα αντικειμένου UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Όνομα κατάστασης:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Κρυμμένο τμήμα:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Χρώμα γραφικού συστατικού"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Κείμενο χωρίς επεξεργασία:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "νέα_κλάση"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Κείμενο με επεξεργασία:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Νέα κλάση"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Ιδιότητες διαγράμματος"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Χαρακτηριστικά κλάσης"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Εστίαση:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Λειτουργίες κλάσης"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Ιδιότητες παραμέτρων"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Εμφάνιση &πλέγματος"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Κατεύθυνση αποστολής"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Προσαρμογή σ&το πλέγμα"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Προσαρμογή μεγέθους συστατικού"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"μέσα\" είναι μια παράμετρος μόνο για ανάγνωση, \"έξω\" είναι μια παράμετρος "
-"μόνο για εγγραφή και \"μέσα/έξω\" είναι μια παράμετρος για εγγραφή και "
-"ανάγνωση."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Δημιουργία"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Τερματισμός"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Δημιουργήθηκε κώδικας"
+"Προσαρμογή του μεγέθους των συστατικών έτσι ώστε να είναι πολλαπλάσιο του "
+"διαστήματος πλέγματος.\n"
+"Αν είναι ενεργοποιημένη η 'Προσαρμογή στο πλέγμα' ένα συστατικό θα είναι "
+"πάντα στοιχισμένο με το πλέγμα και στις 4 πλευρές."
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Δε δημιουργήθηκε"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Διάστιχο πλέγματος:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Δε δημιουργήθηκε ακόμη"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "Χ"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Ο φάκελος %1 δεν υπάρχει. Επιθυμείτε να το δημιουργήσετε τώρα;"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Υ"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Ο φάκελος εξόδου δεν υπάρχει"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Πλάτος γραμμής:  "
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Δημιουργία φακέλου"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Εξαγωγή όλων των προβολών"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Να μη δημιουργηθεί"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Κατάλογος αποθήκευσης των διαγραμμάτων:"
 
-#: 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."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
-"Αδυναμία δημιουργίας του φακέλου.\n"
-"Παρακαλώ σιγουρευτείτε ότι έχετε δικαιώματα εγγραφής στο γονικό φάκελο ή "
-"επιλέξτε κάποιον άλλο, έγκυρο φάκελο."
+"Ο βασικός κατάλογος που θα χρησιμοποιηθεί για την αποθήκευση των εικόνων. Ο "
+"βασικός κατάλογος που θα χρησιμοποιηθεί για την αποθήκευση των εικόνων"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Σφάλμα δημιουργίας φακέλου"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Τύπος ε&ικόνας:"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Παρακαλώ επιλέξτε έναν έγκυρο φάκελο."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Χρήση &φακέλων"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-"Ο φάκελος εξόδου υπάρχει, αλλά δε μπορεί να γραφτεί.\n"
-"Παρακαλώ ορίστε τα κατάλληλα δικαιώματα ή επιλέξτε κάποιον άλλο φάκελο."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Σφάλμα εγγραφής φακέλου εξόδου"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Ο %1 δε φαίνεται να είναι ένας φάκελος. Παρακαλώ επιλέξτε έναν έγκυρο φάκελο."
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Παρακαλώ επιλέξτε έναν έγκυρο φάκελο"
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Το αρχείο προορισμού υπάρχει ήδη"
+"Δημιουργία στον κατάλογο προορισμού της ίδιας δενδρικής δομής που\n"
+"χρησιμοποιήθηκε στο έγγραφο για την αποθήκευση των προβολών"
 
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
+"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 ""
-"Το αρχείο %1 υπάρχει ήδη στο %2.\n"
-"\n"
-"Το Umbrello μπορεί να αντικαταστήσει το αρχείο, να δημιουργήσει ένα παρόμοιο\n"
-"όνομα αρχείου ή να μη δημιουργήσει αυτό το αρχείο."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Εφαρμογή σε όλα τα εναπομείναντα αρχεία"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Αντικατάσταση"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Δημιουργία παρόμοιου ονόματος αρχείου"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Να μη δημιουργηθεί αρχείο"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Χωρίς διαθέσιμες επιλογές.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Πολλαπλότητα"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Εισαγωγή πολλαπλότητας:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Όνομα συσχέτισης"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Εισαγωγή ονόματος συσχέτισης:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Όνομα ρόλου"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Εισαγωγή ονόματος ρόλου:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Εισαγωγή ονόματος λειτουργίας:"
+"Οι προβολές αποθηκεύονται σε φακέλους στο έγγραφο. Με την ενεργοποίηση αυτής "
+"της επιλογής, θα δημιουργηθεί στον επιλεγμένο βασικό κατάλογο η ίδια "
+"δενδρική δομή που χρησιμοποιείται στο έγγραφο για την αποθήκευση των "
+"προβολών.\n"
+"Μόνο οι φάκελοι που φτιάχτηκαν από το χρήστη θα δημιουργηθούν στο βασικό "
+"κατάλογο (Η λογική προβολή, η περίπτωση χρήσης κλπ. δε θα δημιουργηθούν)."
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Εισαγωγή νέου κειμένου:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Προσαρμοστικότητα ρόλου"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ΣΦΑΛΜΑ"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Ορατότητα ρόλου"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Αλλαγή κειμένου"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "Ε&ξαγωγή"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Στοίχιση αριστερά"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Στοίχιση δεξιά"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Διάγραμμα"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Στοίχιση πάνω"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Νέο"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Στοίχιση κάτω"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Εμ&φάνιση"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Στοίχιση κατακόρυφη στο μέσο"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Εστίαση:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Στοίχιση οριζόντια στο μέσο"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Κώδικας"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Ισοκατανεμημένη κατακόρυφη στοίχιση"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Ενεργή &γλώσσα"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Ισοκατανεμημένη οριζόντια στοίχιση"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Για τη στοίχιση πρέπει να επιλέξετε τουλάχιστον 2 αντικείμενα όπως κλάσεις ή "
-"δράστες. Δε μπορείτε να στοιχίσετε συσχετίσεις."
+"<p>Καλώς ήρθατε στο Umbrello.</p>\n"
+"<p>Τα διαγράμματα UML σας επιτρέπουν να σχεδιάσετε και να τεκμηριώσετε "
+"λογισμικό αντικειμενοστραφούς προγραμματισμού.  <a href=\"help:/umbrello"
+"\">Το εγχειρίδιο Umbrello</a> είναι μια καλή εισαγωγή στη χρήση της UML.</"
+"p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Αυτή είναι μια χρησιμοποιούμενη λέξη κλειδί για τη γλώσσα του ρυθμισμένου "
-"δημιουργού κώδικα."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Χρησιμοποιημένη λέξη"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Εξαγωγή προβολής..."
+"<p>Καλώς ήρθατε στο Umbrello 1.5.  Νέα σε αυτή την έκδοση είναι οι κλάσεις "
+"συσχέτισης,  η δημιουργία κώδικα Ruby, η εξαγωγή φακέλων, η δυνατότητα "
+"αλλαγής των διασυνδέσεων σε κλάσεις, και άλλα ακόμη.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Παρουσιάστηκε σφάλμα κατά την εξαγωγή της εικόνας:\n"
-"Παρουσιάστηκε ένα σφάλμα κατά την εξαγωγή της εικόνας:\n"
+"<p>Τα διαγράμματα σε καρτέλες και οι εξαγόμενοι φάκελοι είναι "
+"αλληλοαναιρούμενοι. Αν χρειάζεστε τους εξωτερικούς φακέλους θα πρέπει να "
+"αποεπιλέξετε τη &quot;Χρήση διαγραμμάτων σε καρτέλες&quot; στις γενικές "
+"ρυθμίσεις.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Το επιλεγμένο αρχείο %1 υπάρχει.\n"
-"Επιθυμείτε την αντικατάστασή του;"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Το αρχείο υπάρχει ήδη"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "νέος_δράστης"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "νέα_περίπτωσηχρήσης"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "νέο_πακέτο"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "νέο_συστατικό"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "νέος_κόμβος"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "νέο_δημιούργημα"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "νέα_διασύνδεση"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "νέος_τύποςδεδομένων"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "νέα_αρίθμηση"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "νέα_οντότητα"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "νέος_φάκελος"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "νέο_αντικείμενο"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Κενό"
+"<p>Τα περισσότερα αντικείμενα διαγραμμάτων δε μπορούν να αλλάξουν μέγεθος, "
+"θα αλλάξουν μέγεθος μόνα τους για να χωρέσει το περιεχόμενό τους.\n"
+"Τα πλαίσια, οι σημειώσεις, και τα μηνύματα διαγράμματος ακολουθίας μπορούν "
+"να αλλάξουν μέγεθος, απλά με ένα κλικ και σύρσιμο στο κόκκινο τετράγωνο.</"
+"p>\n"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Κακώς ορισμένη παράμετρος"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Άγνωστος τύπος παραμέτρου"
+#: 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 ""
+"<p>Αν επιθυμείτε να προσθέσετε μια υπάρχουσα κλάση σε ένα διάγραμμα, απλά "
+"σύρετε την καταχώρησή της από την προβολή δέντρου.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Μη έγκυρο όνομα μεθόδου"
+#: 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 ""
+"<p>Ο βοηθός μεταποίησης του Umbrello σας επιτρέπει να μετακινείτε "
+"λειτουργίες μεταξύ μιας κλάσης και των βασικών και απογόνων\n"
+"κλάσεων.\n"
+"Δεξί κλικ σε μια κλάση για το άνοιγμα του βοηθού μεταποίησης.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Άγνωστος τύπος επιστροφής"
+#: 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 ""
+"<p>Τα αντικείμενα διαγραμμάτων ακολουθίας μπορούν να έχουν ένα πλαίσιο "
+"καταστροφέα και να σχεδιάζονται ως δράστες.  Κάντε διπλό κλικ σε ένα, για\n"
+"το διάλογο ιδιοτήτων.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Απροσδιόριστο σφάλμα"
+#: 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 ""
+"<p>Τα μηνύματα διαγραμμάτων ακολουθίας μπορούν να δράσουν ως κατασκευαστές.  "
+"Κάντε κλικ στο πλαίσιο του αντικειμένου (αντί της κατακόρυφης γραμμής) για "
+"να τα κάνετε κατασκευαστές.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Προσθήκη βασικής κλάσης"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Τα διαγράμματα ακολουθιών υποστηρίζουν μηνύματα στον εαυτό τους.  Κάντε "
+"κλικ στην ίδια κατακόρυφη γραμμή ξανά για τη δημιουργία ενός αυτόματου "
+"μηνύματος.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Προσθήκη απογόνου κλάσης"
+#: 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 ""
+"<p>Αν κατά τη φόρτωση ενός ξένου αρχείου δεν εμφανίζεται τίποτα στη προβολή "
+"λίστας, δοκιμάστε να αποθηκεύσετε το μοντέλο με διαφορετικό όνομα,\n"
+"να το κλείσετε, και να φορτώσετε ξανά το αποθηκευμένο αρχείο. Συνήθως έπειτα "
+"από αυτό η προβολή λίστας συμπληρώνεται σωστά.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Προσθήκη λειτουργίας"
+#: 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 ""
+"<p>Η αποκοπή και αντιγραφή θα εξάγουν επίσης την εικόνα σε πρόχειρο PNG το "
+"οποίο μπορεί να επικολληθεί στο KWord\n"
+"και σε άλλες εφαρμογές.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Προσθήκη χαρακτηριστικού"
+#: 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 ""
+"<p>Οι συσχετίσεις δε χρειάζεται να βρίσκονται σε ευθείες γραμμές, κάνοντας "
+"διπλό κλικ σε μία, θα δημιουργηθεί ένα σημείο που μπορεί να κινηθεί.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Προσθήκη βασικής διασύνδεσης"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Μπορείτε να ενεργοποιήσετε την αυτόματη αποθήκευση στο διάλογο ρύθμισης "
+"του Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Προσθήκη απογόνου διασύνδεσης"
+#: 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 ""
+"<p>Λείπει κάποιο χαρακτηριστικό που χρειάζεστε στο Umbrello; Παρακαλώ "
+"ενημερώστε μας. \n"
+"Μπορείτε είτε να το προσθέσετε στη βάση δεδομένων σφαλμάτων με την αναφορά "
+"σφάλματος από το μενού βοήθειας\n"
+"είτε να το στείλετε στη λίστα ηλεκτρονικού ταχυδρομείου uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Βασικοί κατηγοριοποιητές"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Μπορείτε να διαγράψετε όλα τα επιλεγμένα αντικείμενα πατώντας το Del ή το "
+"Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Απόγονοι κατηγοριοποιητές"
+#: 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 ""
+"<p>Αν βρήκατε κάποιο σφάλμα στο Umbrello, παρακαλώ ενημερώστε μας. \n"
+"Μπορείτε να καταχωρήσετε σφάλματα με το εργαλείο αναφοράς σφάλματος στο "
+"μενού βοήθειας.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Αδύνατη η δημιουργία του φακέλου: %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 ""
+"<p>Πατώντας το πλήκτρο Escape ορίζεται τρέχον εργαλείο το εργαλείο "
+"επιλογής.\n"
+"Το Backspace μεταβαίνει στο προηγούμενο εργαλείο που χρησιμοποιήθηκε.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Αδυναμία αποθήκευσης ενός κενού διαγράμματος"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Μπορείτε να επιλέξετε όλα τα αντικείμενα πατώντας Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Παρουσιάστηκε σφάλμα κατά την αποθήκευση του διαγράμματος στο %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 ""
+"<p>Μπορείτε να δημιουργήσετε και να ρυθμίσετε μια νέα κλάση χρησιμοποιώντας "
+"το μάγο νέας κλάσης στο μενού κώδικα.</p>\n"
diff --git a/tde-i18n-en_GB/messages/tdesdk/umbrello.po b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
index 9388cbd544a..9a45d1230c3 100644
--- a/tde-i18n-en_GB/messages/tdesdk/umbrello.po
+++ b/tde-i18n-en_GB/messages/tdesdk/umbrello.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-01-29 00:02+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -17,250 +17,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML Modeller Authors"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "File to open"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML Modeller Authors"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Jonathan Riddell"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Export as Picture..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kde-en-gb@jriddell.org"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Enter Activity Name"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
-msgstr "There was a problem saving file: %1"
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr "Enter the name of the new activity:"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Save Error"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Align Left"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Object"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Align Right"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synchronous Message"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Align Top"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynchronous Message"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Align Bottom"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Association"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Align Vertical Middle"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Containment"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Align Horizontal Middle"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Anchor"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Align Vertical Middle"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Label"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Align Horizontal Middle"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Note"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Box"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatting"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dependency"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisation"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregation"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relationship"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Directional Association"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implements (Generalisation/Realisation)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composition"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Use Case"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Class"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Initial State"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "End State"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Branch/Merge"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Fork/Join"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Package"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Component"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Node"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dependency"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artifact"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Association"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interface"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Self Association"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datatype"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Collaboration Message"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enum"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sequence Message"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entity"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Collaboration Self Message"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Deep History"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sequence Self Message"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Shallow History"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Containment"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Join"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composition"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Fork"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisation"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Junction"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni Association"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Choice"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Anchor"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "State Transition"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Activity Transition"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Activity"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "State"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicity"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "End Activity"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Enter multiplicity:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Initial Activity"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Association Name"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Message"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Enter association name:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "UNDEFINED"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Role Name"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Select"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Enter role name:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr "That is an invalid name."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Invalid Name"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr "That name is already being used."
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr "Not a Unique Name"
 
 #: 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."
+"At least one of the items in the clipboard could not be pasted because an "
+"item of the same name already exists.  Any other items have been pasted."
 msgstr ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
+"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."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -279,10 +237,8 @@ msgid "Cannot Open File"
 msgstr "Cannot Open File"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Cannot create the folder:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Cannot create the folder:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -296,1342 +252,1521 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Cannot Create Folder"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Enter State Name"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "General Options"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Enter the name of the new state:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Package is a namespace"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtual destructors"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Enter the name of the new activity:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generate empty constructors"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "new activity"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generate accessor methods"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML Model"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operations are inline"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logical View"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Accessors are inline"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Use Case View"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Accessors are public"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Component View"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importing file: %1"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Deployment View"
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Ready."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entity Relationship Model"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Is the scope %1 a namespace or a class?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datatypes"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ Import Requests Your Help"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Namespace"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "The file %1 does not exist."
+#: 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 "Class"
 
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Load Error"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Internal Error"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "The file %1 seems to be corrupted."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntax Error before '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "There was no XMI file found in the compressed file %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Parse Error before '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "There was a problem loading the extracted file: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "There was a problem loading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "expression expected"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "There was a problem uploading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Declaration syntax error"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "use case diagram"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} expected"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "class diagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace expected"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sequence diagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ expected"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "collaboration diagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Namespace name expected"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "state diagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Need a type specifier to declare"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "activity diagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "expected a declaration"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "component diagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Constant expression expected"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "deployment diagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' expected"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "entity relationship diagram"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} missing"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Name"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Member initialisers expected"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Enter name:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Base class specifier expected"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "That is an invalid name for a diagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Initialiser clause expected"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Invalid Name"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identifier expected"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "A diagram is already using that name."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Type id expected"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
-msgstr "Not a Unique Name"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Class name expected"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
-msgstr "That is an invalid name."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "condition expected"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
-msgstr "That name is already being used."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "statement expected"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for initialisation expected"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Name Not Unique"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch expected"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Use Name"
+#: 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 "&Properties"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Enter New Name"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Initial activity"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Are you sure you want to delete diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "End activity"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Delete Diagram"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Branch/Merge"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Setting up the document..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Fork/Join"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Resolving object references..."
+#: 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 "General"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Loading UML elements..."
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "General Properties"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Loading diagrams..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Activity type:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Activity name:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Documentation"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Externalise Folder"
+#: 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 "Font:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Enter Model Name"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Font Settings"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Enter the new name of the model:"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Colour"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Views"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Widget Colours"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"The name you entered was invalid.\n"
-"Creation process has been cancelled."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Activities"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Name Not Valid"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "New Activity..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"The name you entered was not unique!\n"
-"Creation process has been cancelled."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Delete Anchor"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Creation cancelled"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Rename"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Loading listview..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "New Activity"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "The folder must be emptied before it can be deleted."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "new activity"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Folder Not Empty"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Rename Activity"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Enter the new name of the activity:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Enter Activity Name"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "new state"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisation"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associations"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Self Association"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Association Properties"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Collaboration Message"
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "General Settings"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sequence Message"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roles"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Collaboration Self Message"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Role Settings"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sequence Self Message"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Association font"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisation"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Role A Properties"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni Association"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Role B Properties"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Role A Visibility"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Role B Visibility"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&New"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Role A Changeability"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Sh&ow"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Role B Changeability"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Code"
+msgid "Rolename:"
+msgstr "Rolename:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Active &Language"
+msgid "Multiplicity:"
+msgstr "Multiplicity:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentation"
+msgid "Public"
+msgstr "Public"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Slash-Slash (//)"
+msgid "Private"
+msgstr "Private"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Slash-Star (/**  */)"
+msgid "Protected"
+msgstr "Protected"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Style:"
+msgid "Implementation"
+msgstr "Implementation"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ Code Generation</p>"
+msgid "Changeable"
+msgstr "Changeable"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "General"
+msgid "Frozen"
+msgstr "Frozen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Method Body Generation"
+msgid "Add only"
+msgstr "Add only"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Use following for classes in generated code:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Class &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Actor &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Package &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Use case &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Interface &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Component &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artifact &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Enum &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datatype &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entity &name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotype name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Package name:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Class name"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstract class"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstract use case"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Project Generation"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Executable"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Create ANT build document"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Draw As"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Auto-Generate Methods"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Default"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Empty constructor methods"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Fill:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Association accessor methods"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Library"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Attribute accessor methods"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Table"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibility"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Private"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublic"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivate"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "From Parent Object"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Default attribute accessor scope:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentation"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Default association field scope:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Class name:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "From Parent Role"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instance name:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Draw as actor"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hash (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Multiple instance"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Begin-End (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Show destruction"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby Code Generation</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Component name:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Node name:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotype name:"
+
+#: 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 ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Name is Not Unique"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attributes"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ew Attribute..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operations"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&ew Operation..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Templates"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&ew Template..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum Literals"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ew Enum Literal..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entity Attributes"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ew Entity Attribute..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Delete Anchor"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Properties"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Show"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operatio&ns"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibility"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&peration signature"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pac&kage"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributes"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&ype"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibute signature"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Draw as circle"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Display"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Display Options"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribute Settings"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operation Settings"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Templates Settings"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Enum Literals Settings"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Entity Attributes Settings"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Containment"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Contents Settings"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Class Associations"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "new_class"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "New Class"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Class Attributes"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Class Operations"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Code Generation Options"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Language"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generate"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Folders"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Finish"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Write all generated files to folder:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Code Generated"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Bro&wse..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Not Generated"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "B&rowse..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Not Yet Generated"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Include heading files from folder:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "The folder %1 does not exist. Do you want to create it now?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Files generated by Code Generator will be written to this folder"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Output Folder Does Not Exist"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Create Folder"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Do Not Create"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Overwrite Policy"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Error Creating Folder"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Please select a valid folder."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "O&verwrite"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Error Writing to Output Folder"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Overwrite existing files if they exist in the destination folder"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 does not seem to be a folder. Please choose a valid folder."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "As&k"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Please Choose Valid Folder"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "If a file with the same name already exists, ask what to do"
+msgid "Code Viewer"
+msgstr "Code Viewer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Use a different name"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">No Options Available.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrams"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatting"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Lines"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Current diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Line ending style:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&All diagrams"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Indentation type:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Select diagrams"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Indentation amount:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Type of diagram"
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selection"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Use Case"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Collaboration"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sequence"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "State"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Component"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Deployment"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "No diagrams selected."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+msgid "The format that the images will be exported to"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Note Documentation"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Destination File Already Exists"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"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."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Apply to all remaining files"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "No Indentation"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Overwrite"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generate Similar File Name"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Space"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Do Not Generate File"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Comment Verbosity"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameter Properties"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr ""
-"Write comments &for sections even if section \n"
-"is empty"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Type:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Name:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Initial value:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Passing Direction"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Write documentation comments even if empty"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Contained Items"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Write comments &for class and method documentation even if empty"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Select Operation"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Language Options"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sequence number:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Code Generation Wizard"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Class operation:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Select Classes"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Custom operation:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Umbrello Setup"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "User Interface"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "User Interface Settings"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Line colour:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "D&efault Colour"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Fill colour:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "De&fault Colour:"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Line width:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "D&efault Width"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Use fill colour"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Add class for code generation"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Enable undo"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Classes Selected"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Use tabbed diagrams"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Remove class from Code Generation"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Use new C++/Java/Ruby generators"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Classes Available"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Default association field scope:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Code Generation Status"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Autosave"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Press the Generation button to start the code generation"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "E&nable autosave"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Generation Status"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Select auto-save time interval (mins):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Code Viewer"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Set autosave suffix:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">component name here</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Startup"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Show block type"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Sta&rtup logo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Colours"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Tip of the day"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Font:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Load last project"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Paper:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Start new project with:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Selected:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "No Diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML object block:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Class Diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Hidden block:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Use Case Diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sequence Diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Collaboration Diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagram Properties"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "State Diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Name:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Activity Diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zoom:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Component Diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Deployment Diagram"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Class Settings"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Show &visibility"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Show attributes"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Show operations"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Show stereot&ype"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Show attribute signature"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Show package"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Show operation signature"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Show &grid"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Starting Scope"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Snap &to grid"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Default attribute scope:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Snap component size"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Default operation scope:"
 
-#. 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."
-msgstr ""
-"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/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Code Generation"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Grid spacing:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Code Generation Settings"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Code Viewer Settings"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Initial state"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Line width:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "End state"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Export as Picture..."
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "State type:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "State name:"
 
-#. 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"
-msgstr ""
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Widget Colour"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "State type:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribute Properties"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Classifier &scope (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "folder"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&ected"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementation"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "You have entered an invalid attribute name."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attribute Name Invalid"
+
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"The 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
+"The attribute name you have chosen is already being used in this operation."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Role Properties"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attribute Name Not Unique"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rolename:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Entity Attribute Properties"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicity:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Default value:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Role Changeability"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Length/Values:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Add only"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto increment"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Frozen"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Allow &null"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Changeable"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributes:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Role Visibility"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexing"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementation"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&None"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primary"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unique"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "You have entered an invalid entity attribute name."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Entity Attribute Name Invalid"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Entity Attribute Name Not Unique"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operation Properties"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstract operation"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Query (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parameters"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Ne&w Parameter..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>You can turn on autosaving in the Configure Umbrello dialogue.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "You have entered an invalid parameter name."
 
-#: tips.txt:76
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parameter Name Invalid"
+
+#: dialogs/umloperationdialog.cpp:339
 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"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameter Name Not Unique"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "You have entered an invalid operation name."
 
-#: tips.txt:91
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operation Name Invalid"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "An operation with that signature already exists in %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Choose a different name or parameter list."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Role Properties"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Template Properties"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "You have entered an invalid template name."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Template Name Invalid"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<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"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 
-#: 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"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Template Name Not Unique"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Classes Display Options"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagram Colours"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "The name you have entered is invalid."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "The name you have entered is not unique."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Name Not Unique"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Line:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Fill:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "D&efault"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Use fill"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Export as Picture..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr "There was a problem saving file: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Save Error"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML Modeller Authors"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "File to open"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML Modeller Authors"
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Name"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Enter name:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Enter operation name:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Enter new text:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERROR"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Change Text"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "The folderfile %1 does not exist."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Load Error"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "The folderfile %1 cannot be opened."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1685,6 +1820,10 @@ msgstr "New Operation..."
 msgid "Select Operation..."
 msgstr "Select Operation..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Change Text..."
@@ -1736,6 +1875,19 @@ msgstr "New"
 msgid "Rename..."
 msgstr "Rename..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Paste Error"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Line Colour..."
@@ -1764,14 +1916,26 @@ msgstr "Internalise Folder"
 msgid "Import Classes..."
 msgstr "Import Classes..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Package"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artifact"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Component Diagram..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Node"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Deployment Diagram..."
@@ -1780,10 +1944,18 @@ msgstr "Deployment Diagram..."
 msgid "Folder"
 msgstr "Folder"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entity"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Entity Relationship Diagram..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Actor"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Use Case Diagram..."
@@ -1820,6 +1992,18 @@ msgstr "New Entity Attribute..."
 msgid "Export as Picture..."
 msgstr "Export as Picture..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interface"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datatype"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enum"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Class Diagram..."
@@ -1840,26 +2024,10 @@ msgstr "Sequence Diagram..."
 msgid "Collaboration Diagram..."
 msgstr "Collaboration Diagram..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attributes"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operations"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Public Only"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibility"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operation Signature"
@@ -1872,11 +2040,6 @@ msgstr "Attribute Signature"
 msgid "Stereotype"
 msgstr "Stereotype"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Show"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribute..."
@@ -1901,14 +2064,6 @@ msgstr "Fill Colour..."
 msgid "Use Fill Color"
 msgstr "Use Fill Colour"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Colour"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Actor..."
@@ -1937,10 +2092,26 @@ msgstr "Enum..."
 msgid "Package..."
 msgstr "Package..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Initial State"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "End State"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "State..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Initial Activity"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "End Activity"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -1986,6 +2157,14 @@ msgstr "Delete Anchor"
 msgid "Change Association Name..."
 msgstr "Change Association Name..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Clear Diagram"
@@ -2020,194 +2199,104 @@ 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 "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Incorrect use of associations."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Association Error"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "The folderfile %1 does not exist."
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "new_actor"
 
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "The folderfile %1 cannot be opened."
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "new_usecase"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Jonathan Riddell"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "new_package"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kde-en-gb@jriddell.org"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "new_component"
 
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Ready."
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "new_node"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "new_artifact"
 
-#: 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 ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "new_interface"
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Is the scope %1 a namespace or a class?"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "new_datatype"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ Import Requests Your Help"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "new_enum"
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Namespace"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "new_entity"
 
-#: codeimport/classimport.cpp:34
+#: model_utils.cpp:264
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importing file: %1"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Internal Error"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntax Error before '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Parse Error before '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "expression expected"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Declaration syntax error"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} expected"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace expected"
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ expected"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Namespace name expected"
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Need a type specifier to declare"
-
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "expected a declaration"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Constant expression expected"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' expected"
+msgid "new_folder"
+msgstr "new_node"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} missing"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "new_association"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Member initialisers expected"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "new_object"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Base class specifier expected"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Initialiser clause expected"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Empty"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identifier expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Malformed argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Type id expected"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Unknown argument type"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Class name expected"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Illegal method name"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "condition expected"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Unknown return type"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "statement expected"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Unspecified error"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for initialisation expected"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"This is a reserved keyword for the language of the configured code generator."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch expected"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserved Keyword"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2221,105 +2310,66 @@ msgstr "Enter object name:"
 msgid "new_parameter"
 msgstr "new_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "General Options"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Package is a namespace"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtual destructors"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generate empty constructors"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generate accessor methods"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operations are inline"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Accessors are inline"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Accessors are public"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Page %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Enter Diagram Name"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Add Base Class"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Enter the new name of the diagram:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Add Derived Class"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Add Operation"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Delete Diagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Add Attribute"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Rename cancelled"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Add Base Interface"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Renaming an item of listview type %1 is not yet implemented."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Add Derived Interface"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Function Not Implemented"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Base Classifiers"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"The name you entered was invalid.\n"
-"Renaming process has been cancelled."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Derived Classifiers"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "new_association"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Enter State Name"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "new_attribute"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Enter the name of the new state:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "new_template"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Enter Activity"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "new_operation"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Incorrect use of associations."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "new_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Association Error"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "new_field"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "new state"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2474,11 +2524,6 @@ msgstr "&Export as Picture..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Export All Diagrams as Images"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Properties"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Zoom Slider"
@@ -2563,21 +2608,28 @@ msgstr "&Documentation"
 msgid "Opening file..."
 msgstr "Opening file..."
 
+#: 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 "Creating new document..."
 
 #: uml.cpp:673
 msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, *."
+"xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Uncompressed XMI Files (*.xmi)\n"
 "*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.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"
@@ -2607,6 +2659,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
 "*|All Files"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2615,6 +2671,10 @@ msgstr ""
 "The file %1 exists.\n"
 "Do you wish to overwrite it?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Overwrite"
@@ -2650,11 +2710,11 @@ msgstr "Inserting clipboard contents..."
 
 #: uml.cpp:849
 msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+"Umbrello could not paste the clipboard contents.  The objects in the "
+"clipboard may be of the wrong type to be pasted here."
 msgstr ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+"Umbrello could not paste the clipboard contents.  The objects in the "
+"clipboard may be of the wrong type to be pasted here."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2709,1261 +2769,1300 @@ msgstr "All Files"
 msgid "Select Code to Import"
 msgstr "Select Code to Import"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Class &name:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Actor &name:"
-
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Package &name:"
-
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Use case &name:"
-
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Interface &name:"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Component &name:"
-
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artifact &name:"
-
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Enum &name:"
-
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datatype &name:"
-
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entity &name:"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotype name:"
-
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Package name:"
-
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstract class"
-
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstract use case"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Executable"
-
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Draw As"
-
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Default"
-
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Library"
-
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Table"
-
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublic"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "new_attribute"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivate"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "new_operation"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentation"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "new_literal"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Class name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "new_field"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instance name:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML Model"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Draw as actor"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logical View"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Multiple instance"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Use Case View"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Show destruction"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Component View"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Component name:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Deployment View"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Node name:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entity Relationship Model"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotype name:"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datatypes"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:229
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Name is Not Unique"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Line:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Fill:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "D&efault"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Use fill"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Activities"
+"The current file has been modified.\n"
+"Do you want to save it?"
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "New Activity..."
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "The file %1 does not exist."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Rename"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "The file %1 seems to be corrupted."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "New Activity"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "There was no XMI file found in the compressed file %1."
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Rename Activity"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "There was a problem loading the extracted file: %1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Enter the new name of the activity:"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "There was a problem loading file: %1"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Association Properties"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "There was a problem uploading file: %1"
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "General Settings"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "use case diagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roles"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "class diagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Role Settings"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sequence diagram"
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Font Settings"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "collaboration diagram"
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Association font"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "state diagram"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Template Properties"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "activity diagram"
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "General Properties"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "component diagram"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Type:"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "deployment diagram"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Name:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "entity relationship diagram"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "You have entered an invalid template name."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "That is an invalid name for a diagram."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Template Name Invalid"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "A diagram is already using that name."
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Template Name Not Unique"
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Entity Attribute Properties"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Use Name"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Default value:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Enter New Name"
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Length/Values:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Are you sure you want to delete diagram %1?"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto increment"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Delete Diagram"
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Allow &null"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Setting up the document..."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributes:"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Resolving object references..."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexing"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Loading UML elements..."
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&None"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Loading diagrams..."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primary"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externalise Folder"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unique"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Enter Model Name"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "You have entered an invalid entity attribute name."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Enter the new name of the model:"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Entity Attribute Name Invalid"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Views"
 
-#: 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 ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Entity Attribute Name Not Unique"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Display"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Classes Display Options"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagram Colours"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "The name you have entered is invalid."
+"The name you entered was invalid.\n"
+"Creation process has been cancelled."
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "The name you have entered is not unique."
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Name Not Valid"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"The name you entered was not unique!\n"
+"Creation process has been cancelled."
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello Setup"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Creation cancelled"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "User Interface"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Loading listview..."
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "User Interface Settings"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "The folder must be emptied before it can be deleted."
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Line colour:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Folder Not Empty"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "D&efault Colour"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Rename cancelled"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Fill colour:"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Renaming an item of listview type %1 is not yet implemented."
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "De&fault Colour:"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Function Not Implemented"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Line width:"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"The name you entered was invalid.\n"
+"Renaming process has been cancelled."
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "D&efault Width"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Page %1"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Use fill colour"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Enter Diagram Name"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Enable undo"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Enter the new name of the diagram:"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Use tabbed diagrams"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Use new C++/Java/Ruby generators"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Delete Diagram?"
 
-#: dialogs/settingsdlg.cpp:120
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "Default association field scope:"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Autosave"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "E&nable autosave"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Select auto-save time interval (mins):"
+msgid "Exporting view..."
+msgstr "Exiting..."
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "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 ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Startup"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Sta&rtup logo"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Tip of the day"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Load last project"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Start new project with:"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "No Diagram"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Class Diagram"
-
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Use Case Diagram"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "File Already Exists"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sequence Diagram"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Cannot Create Folder"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Collaboration Diagram"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Can not save an empty diagram"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "State Diagram"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Activity 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:186
-msgid "Component Diagram"
-msgstr "Component 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:187
-msgid "Deployment Diagram"
-msgstr "Deployment Diagram"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Object"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Class Settings"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synchronous Message"
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Show &visibility"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynchronous Message"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Show attributes"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Label"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Show operations"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Note"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Show stereot&ype"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Box"
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Show attribute signature"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relationship"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Show package"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Directional Association"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Starting Scope"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implements (Generalisation/Realisation)"
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Default attribute scope:"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Deep History"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Default operation scope:"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Shallow History"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Code Generation"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Join"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Code Generation Settings"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Fork"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Code Viewer Settings"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Junction"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operation Properties"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Choice"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstract operation"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Activity Transition"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Classifier &scope (\"static\")"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Message"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Query (\"const\")"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "UNDEFINED"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&ected"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Select"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementation"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parameters"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Ne&w Parameter..."
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "You have entered an invalid parameter name."
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parameter Name Invalid"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Show operations"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameter Name Not Unique"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Clear Diagram"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
-"The parameter name you have chosen is already being used in this operation."
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "You have entered an invalid operation name."
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalisation"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operation Name Invalid"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
 msgid ""
-"An operation with that signature already exists in %1.\n"
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
-"An operation with that signature already exists in %1.\n"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Choose a different name or parameter list."
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Role A Properties"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Role B Properties"
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Role A Visibility"
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Role B Visibility"
-
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Role A Changeability"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Association Name"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Role B Changeability"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Contained Items"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Note Documentation"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ew Attribute..."
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Default"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ew Operation..."
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Templates"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-Slash (//)"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ew Template..."
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-Star (/**  */)"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum Literals"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Style:"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ew Enum Literal..."
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ Code Generation</p>"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entity Attributes"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Method Body Generation"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ew Entity Attribute..."
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Use following for classes in generated code:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Initial activity"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "End activity"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Activity type:"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variable</b>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Activity name:"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Widget Colours"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attribute Properties"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Initial value:"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">List</p>"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "You have entered an invalid attribute name."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attribute Name Invalid"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-"The attribute name you have chosen is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attribute Name Not Unique"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Class name"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Select Operation"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Include file</p></i>"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sequence number:"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Project Generation"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Class operation:"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Create ANT build document"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Custom operation:"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Auto-Generate Methods"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrams"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Empty constructor methods"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Association accessor methods"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Current diagram"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Attribute accessor methods"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&All diagrams"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "From Parent Object"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Select diagrams"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Default attribute accessor scope:"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Type of diagram"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Default association field scope:"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selection"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "From Parent Role"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Collaboration"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java Code Generation</p>"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sequence"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hash (#)"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Deployment"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Begin-End (=begin  =end)"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "No diagrams selected."
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby Code Generation</p>"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Display Options"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Language"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribute Settings"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Folders"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operation Settings"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Write all generated files to folder:"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Templates Settings"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Bro&wse..."
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Enum Literals Settings"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "B&rowse..."
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Entity Attributes Settings"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Include heading files from folder:"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Contents Settings"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Files generated by Code Generator will be written to this folder"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associations"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Files in this folder will be used as heading files in the generated code"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Class Associations"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Overwrite Policy"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operatio&ns"
+#: 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 ""
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibility"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "O&verwrite"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&peration signature"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Overwrite existing files if they exist in the destination folder"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pac&kage"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "As&k"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributes"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "If a file with the same name already exists, ask what to do"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&ype"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Use a different name"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibute signature"
+#: 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 ""
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Draw as circle"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatting"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Initial state"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Lines"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "End state"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Line ending style:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "State type:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Indentation type:"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "State name:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Indentation amount:"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Widget Colour"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "new_class"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "New Class"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Class Attributes"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "No Indentation"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Class Operations"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameter Properties"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Space"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Passing Direction"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Comment Verbosity"
 
-#: 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 ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generate"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Finish"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Code Generated"
+"Write comments &for sections even if section \n"
+"is empty"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Not 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 ""
+"Writes comments to indicate the different sections (public, private etc) in "
+"a class, even if the sections are empty"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Not Yet Generated"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Write documentation comments even if empty"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Write comments &for class and method documentation even if empty"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Output Folder Does Not Exist"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Language Options"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Create Folder"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Code Generation Wizard"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Do Not Create"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Select Classes"
 
-#: 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 ""
-"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"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Error Creating Folder"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Add class for code generation"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Please select a valid folder."
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Classes Selected"
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Remove class from Code Generation"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Error Writing to Output Folder"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Classes Available"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 does not seem to be a folder. Please choose a valid folder."
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Code Generation Status"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Please Choose Valid Folder"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Press the Generation button to start the code generation"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Destination File Already Exists"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Generation Status"
 
-#: 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."
-msgstr ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Show hidden blocks"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Apply to all remaining files"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">component name here</p>"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Overwrite"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generate Similar File Name"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Show block type"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Do Not Generate File"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Colours"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">No Options Available.</p>"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Font:"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicity"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Paper:"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Enter multiplicity:"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Selected:"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Association Name"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML object block:</p>"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Enter association name:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Hidden block:</p>"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Role Name"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Uneditable text:</p>"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Enter role name:"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Editable text:</p>"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Enter operation name:"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagram Properties"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Enter new text:"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zoom:"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERROR"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Change Text"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Show &grid"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Align Left"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Snap &to grid"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Align Right"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Snap component size"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Align Top"
+#: 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 ""
+"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."
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Align Bottom"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Grid spacing:  "
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Align Vertical Middle"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Align Horizontal Middle"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Align Vertical Middle"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Line width:  "
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Align Horizontal Middle"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Export as Picture..."
 
-#: 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 ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
 
-#: 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 ""
-"This is a reserved keyword for the language of the configured code generator."
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reserved Keyword"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "State type:"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Exiting..."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "folder"
 
-#: 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 ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "File Already Exists"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "new_actor"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Role Changeability"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "new_usecase"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Role Visibility"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "new_package"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "new_component"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "new_node"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "new_artifact"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&New"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "new_interface"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Sh&ow"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "new_datatype"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zoom:"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "new_enum"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Code"
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "new_entity"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Active &Language"
 
-#: model_utils.cpp:264
+#: tips:3
 #, fuzzy
-msgid "new_folder"
-msgstr "new_node"
+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 ""
+"<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"
 
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "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 ""
+"<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"
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Empty"
+#: 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 ""
+"<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"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "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 ""
+"<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"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "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 ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "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 ""
+"<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"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "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 ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as "
+"actors.  Double click one for\n"
+"the Properties dialogue.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "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 ""
+"<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"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "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 ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "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 ""
+"<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"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "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 ""
+"<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"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "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 ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Add Base Interface"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>You can turn on autosaving in the Configure Umbrello dialogue.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "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 ""
+"<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"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Base Classifiers"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "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 ""
+"<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"
 
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Cannot Create Folder"
+#: 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 ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Can not save an empty diagram"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>You can select all objects by pressing Ctrl-A.</p>\n"
 
-#: 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 ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "new_stereotype"
diff --git a/tde-i18n-eo/messages/tdesdk/umbrello.po b/tde-i18n-eo/messages/tdesdk/umbrello.po
index 066c0525865..93b5190f79b 100644
--- a/tde-i18n-eo/messages/tdesdk/umbrello.po
+++ b/tde-i18n-eo/messages/tdesdk/umbrello.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-02-24 00:32+0200\n"
 "Last-Translator: Oliver M. Kellogg <okellogg@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -16,248 +16,208 @@ 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 "Aŭtonoma generilo por Umbrello UML Modeller"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Dosiero transformenda"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "La dosiero XSLT uzenda"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(k) 2006 Gael de Chalendar (aka Kleag), (k) 2002-2006 Aŭtoroj de Umbrello UML "
-"Modeller"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Aŭtoroj de Umbrello UML Modeller"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Oliver Kellogg"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Eksportanta ĉiujn bildojn..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "okellogg@users.sourceforge.net"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Iuj eraroj okazis dum la eksportado de la bildoj:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Enigi Nomon de Aktiveco"
 
-#: 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 "Problemo dum la savado de la dosiero: %1"
+#: 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 "Enigu la nomon de la nova aktiveco:"
 
-#: 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 "Savo-Eraro"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Vicigi Maldekstre"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekto"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Vicigi Dekstre"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Sinkrona Mesaĝo"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Vicigi Supre"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Nesinkrona Mesaĝo"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Vicigi Malsupre"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Asocio"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Vicigi Vertikal-Centre"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Enteno"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Vicigi Horizontal-Centre"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ankro"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Vicigi Vertikal-Distribue"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etikedo"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Vicigi Horizontal-Distribue"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Noto"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Por la vicigado vi devas elekti almenaŭ 2 objektojn kiel klasoj aŭ aktoroj. "
+"Ne eblas vicigi asociojn."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Skatolo"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatado"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktoro"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dependeco"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Ĝeneraligo"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agrego"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Rilato"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Direktita Asocio"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementas (Ĝeneraligo/Realigo)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kunmetaĵo"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Uzkazo"
-
-#. 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 "Klaso"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Komenca Stato"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Fina Stato"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Branĉi/Kunfandiĝi"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Disiĝi/Kuniĝi"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pako"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponanto"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nodo"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dependeco"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefaraĵo"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Asocio"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfaco"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Memasocio"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datumtipo"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Kunlabormesaĝo"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enum"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sekvencmesaĝo"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Ento"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Kunlabora Mem-Mesaĝo"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Profunda Historio"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sekvenca Mem-Mesaĝo"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Malprofunda Historio"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Enteno"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Kuniĝi"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kunmetaĵo"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Disiĝi"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realigo"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Kuniĝo"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Unudirekta Asocio"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Elekto"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ankro"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Statotransiro"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Aktivecotransiro"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktiveco"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stato"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multeco"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Fina Aktiveco"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Enigi multecon:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Komenca Aktiveco"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nomo de Asocio"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mesaĝo"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Enigi nomon de asocio:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "NEDIFINITA"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rolnomo"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Selekti"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Enigi nomon de rolo:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Operacio kun la sama nomo kaj signaturo jam ekzistas. Vi ne povas aldoni ĝin "
+"refoje."
+
+#: 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 "Tio ne estis valida nomo."
+
+#: 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 "Nevalida Nomo"
+
+#: 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 "Tiu nomo estas jam uzata."
+
+#: 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 "Nomo Ne Unika"
 
 #: 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."
+"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 ""
-"Almenaŭ unu el la objektoj en la tondujo ne povis esti regluata ĉar objekto de "
-"sama nomo jam ekzistas.  Iaj aliaj objektoj estis regluataj."
+"Almenaŭ unu el la objektoj en la tondujo ne povis esti regluata ĉar objekto "
+"de sama nomo jam ekzistas.  Iaj aliaj objektoj estis regluataj."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -276,10 +236,8 @@ msgid "Cannot Open File"
 msgstr "Malfermado Ne Eblas"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ne eblas krei la tekon:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ne eblas krei la tekon:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -293,1340 +251,1519 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Tekokreado Neebla"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Enigi Nomon de Stato"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Ĝeneralaj Fiksaĵoj"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Enigi nomon de nova stato"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Pako formas nomspacon"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Enigu Aktivecon"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtualaj malkonstruiloj"
 
-#: 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 "Enigu la nomon de la nova aktiveco:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generi malplenajn konstruilojn"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nova aktiveco"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generi alirmetodojn"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML Modelo"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operacioj estas enliniaj"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logika  Perspektivo"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Alirmetodoj estas enliniaj"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Uzkaza Perspektivo"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Alirmetodoj estas publikaj"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponanta Perspektivo"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importante dosieron: %1 Progreso: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Sterna Perspektivo"
+#: 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 "Preta."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Ento-Rilata Perspektivo"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Ĉu la regiono %1 estas nomspaco aŭ klaso?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datumtipoj"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ Importo Postulas Vian Helpon"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"La aktuala dosiero estas modifita.\n"
-"Ĉu vi volas savi ĝin?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Nomspaco"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "La dosiero %1 ne ekzistas."
+#: 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 "Klaso"
 
-#: 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 "Eraro dum Ŝarĝado"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr ""
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "La dosiero %1 ŝajnas esti koruptita."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Umbrello ne trovis XMI-dosieron en la komprimita dosiero %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Okazis problemo dum la ŝarĝado de la eltirita dosiero: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Problemo dum la ŝarĝado de la dosiero: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Okazis problemo alŝutante la dosieron: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "uzkazdiagramo"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klasdiagramo"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sekvencdiagramo"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "kunlabordiagramo"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "statodiagramo"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "aktivecdiagramo"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponantdiagramo"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "sterndiagramo"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "ento-rilata diagramo"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "Nomo"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "Enigi nomon:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Tio estas nevalida nomo por diagramo."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Nevalida Nomo"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Iu diagramo jam uzas tiun nomon."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "Nomo Ne Unika"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "Tio ne estis valida nomo."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "Tiu nomo estas jam uzata."
+#: 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:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
-"La nomo kiun vi enigis estis neunika.\n"
-"Ĉu tion vi intencis?"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nomo Ne Unika"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Uzi Nomon"
+#: 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 "&Trajtoj"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Enigi Novan Nomon"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Komenca aktiveco"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Ĉu vi certas ke vi volas forigi la diagramon %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Fina aktiveco"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Forigi Diagramon"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Branĉi/Kunfandiĝi"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Preparanta la dokumenton..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Disiĝi/Kuniĝi"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Solvanta objektreferencojn..."
+#: 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 "Ĝenerale"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Ŝarĝanta UML elementojn..."
+#: 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 "Ĝeneralaj Trajtoj"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Ŝarĝanta diagramojn..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tipo de aktiveco:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagramo"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nomo de aktiveco:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Dokumentaro"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Eksterigi Tekon"
+#: 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 "Signaro:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Enigi Modelnomon"
+#: 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 "Elektoj pri Signaro"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Enigu la novan nomon de la modelo:"
+#: 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 "Koloro"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Perspektivoj"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Fenestraĵaj Koloroj"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"La nomo kiun vi enigis estis nevalida.\n"
-"Kreadprocedo nuligita."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivecoj"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nomo Ne Valida"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nova Aktiveco..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"La nomo kiun vi enigis ne estis unika!\n"
-"Kreadprocedo nuligita."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Forigi Ankron"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Kreado Nuligita"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Renomi"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Ŝarĝanta Listoperspektivon..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nova Aktiveco"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "La teko devas esti maplena antaŭ ĝia forigo."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nova aktiveco"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Teko Ne Malplena"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Renomi Aktivecon"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Operacio kun la sama nomo kaj signaturo jam ekzistas. Vi ne povas aldoni ĝin "
-"refoje."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Enigu la novan nomon de la nova aktiveco:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Enigi Nomon de Aktiveco"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nomo:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nova stato"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipo:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Ĝeneraligo"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Asocioj"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Memasocio"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Trajtoj de Asocio"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Kunlabormesaĝo"
+#: 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 "Ĝeneralaj Alĝustigoj"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sekvencmesaĝo"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roloj"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Kunlabora Mem-Mesaĝo"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Alĝustiĝoj de Rolo"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sekvenca Mem-Mesaĝo"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Tiparo de Asocio"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realigo"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Trajtoj de Rolo A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Unudirekta Asocio"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Trajtoj de Rolo B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Eksporti"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Videblo de Rolo A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagramo"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Videblo de Rolo B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nova"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Ŝanĝeblo de Rolo A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "M&ontri"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Ŝanĝeblo de Rolo B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kodo"
+msgid "Rolename:"
+msgstr "Rolnomo:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktiva Program&lingvo"
+msgid "Multiplicity:"
+msgstr "Multeco:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentaro"
+msgid "Public"
+msgstr "Publika"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr ""
+msgid "Private"
+msgstr "Privata"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr ""
+msgid "Protected"
+msgstr "Protektita"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stilo:"
+msgid "Implementation"
+msgstr "Implementnivela"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Kodgenerado por C++</p>"
+msgid "Changeable"
+msgstr "Ŝanĝebla"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Ĝenerale"
+msgid "Frozen"
+msgstr "Frostita"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Generado de Metodkorpoj"
+msgid "Add only"
+msgstr "Nur aldoni"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr ""
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Klas&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr ""
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Aktor&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr ""
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Pako&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variablo</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Uzkaz&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr ""
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Interfac&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr ""
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponant&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr ""
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artefaraĵ&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr ""
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Enum-&nomo"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr ""
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datumtip&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr ""
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Ento&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr ""
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotipnomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr ""
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Pako&nomo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klasnomo"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstrakta klaso"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstrakta uzkazo"
+
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Rulebla"
+
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Pentri Kiel"
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Aŭtomata"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Plenigo:"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Biblioteko"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabelo"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Videblo"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublika"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivata"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tektita"
+
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentnivela"
+
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klasnomo:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instancnomo:"
+
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Pentri kiel aktoro"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Multobla instanco"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Montri malkonstruon"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponantnomo:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nodnomo:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotipa nomo:"
+
+#: 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 ""
+"La nomo kiun vi elektis\n"
+"estas jam uzata.\n"
+"La nomo estis nuligita."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generado de Projekto"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Nomo Ne Unika"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Krei ANT konstrudokumenton"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributoj"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Aŭto-Generi Metodojn"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ova Atributo..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Malplenaj konstruiloj"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacioj"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Alirmetodoj por asocioj"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&ova Operacio..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Alirmetodoj por atributoj"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Ŝablonoj"
 
-#. 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 "Publika"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&ova Ŝablono..."
 
-#. 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 "Privata"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum-Literaloj"
 
-#. 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 "Protektita"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ova Enum-Literalo..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "De Parenca Objekto"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Ento-Atributoj"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Aŭtomata videblo por atributaj aliriloj:"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ova Ento-Atributo..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Aŭtomata videblo por asociaj kampoj:"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Forigi Ankron"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "De Parenca Rolo"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Trajtoj"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Kodgenerado por Java</p>"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Montri"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Dieso (#)"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operacioj"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Komenco-Fino (=begin  =end)"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Videblo"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Kodgenerado por Ruby</p>"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Operacia signaturo"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ko"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributoj"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereotipo"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Atr&ibut-signaturo"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Pentri kiel cirklon"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Montrado"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Montradaj Opcioj"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Atributaj Alĝustaĵoj"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operaciaj Alĝustaĵoj"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Ŝablonaj Alĝustaĵoj"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Enum-Literalaj Alĝustaĵoj"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Ento-Atributaj Alĝustaĵoj"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Enteno"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Alĝustaĵoj de Enhavo"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klas-Asocioj"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_klaso"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nova Klaso"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klas-Atributoj"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klas-Operacioj"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Kodgeneraj Opcioj"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Programlingvo"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Tekoj"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Fini"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Skribi ĉiujn generaĵojn al teko:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kodo Generita"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Superflugi..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ne Generita"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Super&flugi..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ankoraŭ Ne Generita"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Preni kapdosierojn el teko:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "La dosierujo %1 ne ekzistas. Ĉu vi volas krei ĝin nun?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Dosieroj generitaj far la Kodgenerilo estos skribataj al tiu ĉi teko"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Celdosierujo Ne Ekzistas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Krei Dosierujon"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "&Ne Krei"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Dosieroj de tiu ĉi teko etos uzataj kiel kapdosieroj en la generita kodo"
+"La kreado de la dosierujo ne sukcesis.\n"
+"Bonvolu certigi ke vi havas skribpermeson al ĝia parenca dosierujo aŭ elekti "
+"alian, validan, dosierujon."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Superskribado"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Eraro dum Kreado de Dosierujo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Bonvolu elekti validan dosierujon."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Se dosiero ekzistas kiu havas saman nomon kiel la \n"
-" far la kodgenerilo uzota, tiam:"
+"La celdosierujo ekzistas sed ne estas skribebla.\n"
+"Bonvolu doni la ĝustajn permesojn aŭ elekti alian dosierujon."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "S&uperskribi"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Eraro dum Skribado al Celdosierujo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Superskribi ekzistantajn dosierojn en la celteko"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 ne ŝajnas esti dosierujo. Bonvolu elekti validan dosierujon."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Dema&ndi"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Bonvolu Elekti Validan Dosierujon"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Se samnoma dosiero jam ekzistas, tiam demandu kion fari"
+msgid "Code Viewer"
+msgstr "Kodmontrilo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Uzi alian nomon"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Neniu Opcio Disponebla.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Se dosiero jam ekzistas en la celteko, aŭtomate elekt alian nomon far algluado "
-"de sufikso al la dosiernomo"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramoj"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatado"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linioj"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Aktuala diagramo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Liniofina stilo:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Ĉiuj &diagramoj"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Indenta tipo:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Selekti diagramojn"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Indenta kvanto:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tipo de diagramo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selekto"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Uzkazo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Kunlaboro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Neniu indento"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvenco"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabo"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stato"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Spaco"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponanto"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Koncizeco de Komentoj"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Sterno"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagramo"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Neniuj diagramoj estas selektitaj."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "La formato al kiu la bildoj estos eksportataj"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Nota Dokumentaro"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Cela Dosiero Jam Ekzistas"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Generi komentojn &po sekcio eĉ se sekcio estas \n"
-"malplena"
+"La datumaro %1 jam ekzistas en %2.\n"
+"\n"
+"Umbrello povas superskribi tiun dosieron, generi similan\n"
+"dosiernomon aŭ ne generi ĉi tiun dosieron."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Apliki al ĉiuj ceteraj dosieroj"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Superskribi"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generi Similan Dosiernomon"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Ne Generi Dosieron"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parametraj Trajtoj"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipo:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nomo:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Iniciata valoro:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Transdona Direkto"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
+"\"in\" signifas nur-lega parametro, \"out\" signifas nur-skriba parametro "
+"kaj \"inout\" signifas parametro legata kaj skribata."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Generi dokumentadajn komentojn eĉ se malplenaj"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Entenataj Elementoj"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Generi komentojn por &klasa kaj metoda dokumentado eĉ se malplenaj"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Selekti Operacion"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Programlingvaj Opcioj"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sekvenca nombro:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Kodgenera Sorĉisto"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klasoperacio:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Elektu Klasojn"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Laŭmenda operacio:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Konfigurado de Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Uzanto-Interfaco"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Uzanto-Interfaca Konfigurado"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Linia koloro:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Aŭtomata Koloro"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Pleniga koloro:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Aŭtomata Koloro"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Linia amplekso"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Aŭtomata Amplekso"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Uzi plenigan koloron"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Metu ĉiujn klasojn por kiuj kodo estu generota \n"
-"en la dekstran liston"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Aldoni klason por la kodgenerado"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Enŝalti Malfaron"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Klasoj Elekktitaj"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Uzi ikonlistajn diagramojn"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Forigi klason de la Kodgenerado"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Uzi novajn C++/Java/Ruby generilojn"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Klasoj Disponeblaj"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Uzi rektangulajn liniojn por asocioj"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Statuso de Kodgenerado"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Aŭtosavi"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Premu la butonon Generi por komencigi la kodgeneradon"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Enŝalti aŭtosavadon"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Statuso de Generado"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Selekti tempintervalon por aŭtosavo (minutoj):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kodmontrilo"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Fiksi aŭtosavan sufikson:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Montri kaŝitajn blokojn"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>La aŭtosava dosiero estos ~/autosave.xmi se la aŭtosavado okazas "
+"antaŭ via permana savado de la dosiero.</p><p>Se vi jam ĝin savis, la "
+"aŭtosava dosiero estos skribata en la saman tekon kiel la dosiero kaj estos "
+"nomata same kiel la dosiero, sekvata de la sufikso specifita.</p><p>Se la "
+"sufikso samas al la sufikso de la dosiero, la aŭtosavado aŭtomate "
+"superskribos vian dosieron.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">nomon de komponanto tien</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Startado"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Montri bloktipon"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Sta&rtemblemo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Koloroj"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "Sugesto de la &Tago"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Signaro:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Ŝarĝi lastan projekton"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papero:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Starti novan projekton kun:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Elektita:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Neniu Diagramo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UMLa objektbloko:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klasdiagramo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Kaŝita bloko:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Uzkazdiagramo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Neredaktebla teksto:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sekvencdiagramo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Redaktebla teksto:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Kunlabordiagramo"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagramtrajtoj"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Statodiagramo"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nomo:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Aktivecdiagramo"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zomo:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponantdiagramo"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr ""
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Sterndiagramo"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Fiksaĵoj por Klaso"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Montri &videblon"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Montri atributojn"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Montri operaciojn"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Montri stereotipon"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Montri atritbutsignaturon"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Montri pakon"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Montri operacisignaturon"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Montri &kradon"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Komenca Amplekso"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Kon&grui al krado"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Aŭtomata atribut-amplekso:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Kradigi grandecon de komponantoj"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Aŭtomata operaci-amplekso:"
 
-#. 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."
-msgstr ""
-"Kongruigi la grandecon de la komponantoj al multobloj de la krada interspaco.\n"
-"Se 'Kongrui al Krado' estas enŝaltita, komponanto ĉiuflanke kongruos al la "
-"krado."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kodgenerado"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Interspacado de krado:"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Kodgeneraj Fiksaĵoj"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Kodmontrilaj Fiksaĵoj"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Komenca stato"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Amplekso de linioj:"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Fina stato"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Eksporti ĉiujn diagramojn"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Statotipo:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Dosierujo por la savado de diagramoj:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Statonomo:"
 
-#. 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"
-msgstr "La baza dosierujo por la savado de diagramoj"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Fenestraĵa Koloro"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Bildotipo:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Atributaj Trajtoj"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "La formato al kiu la bildoj estos eksportataj"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Klasifikila amplekso (\"statika\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Uzi &tekojn"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Publika"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Krei en la celdosierujo la saman arbostrukturon kiel jam \n"
-"ekzistanta en la dokumento por la bildoj"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&ektita"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementnivela"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Vi enigis nevalidan atributnomon."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Atributa Nomo Nevalida"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Ene de la dokumento, la bildoj estas storataj en tekoj. Uzante tiun ĉi opcion, "
-"la sama arbostrukturo de la dokumento rekonstruiĝos ĉe la elektita "
-"bazdosierujo.\n"
-"Nur tiuj teko kiuj kreiĝis far la uzanto ankaŭ kreiĝos en la bazdosierujo (teko "
-"de Logika Perspektivo, Uzkazperspektivo ktp. ne estos kreataj)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "La atributnomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Roltrajtoj"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Atributnomo Ne Unika"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rolnomo:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Ento-Atributaj Trajtoj"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multeco:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Aŭtomata valoro:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Ŝanĝeblo de Rolo"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Longeco/Valoroj:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Nur aldoni"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto inkremento"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Frostita"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Permesi &nulon"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Ŝanĝebla"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributoj:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Videblo de Rolo"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksado"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementnivela"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Neniu"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Bonvenon al Umbrello.</p>\n"
-"<p>UML-diagramoj permesas al vi desegni kaj dokumenti objektorientitajn "
-"programojn.  <a href=\"help:/umbrello\">La Manlibro de Umbrello</a> "
-"estas bona enkonduko al la uzado de UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primara"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Bonvenon al Umbrello 1.5.  Nova en ĉi tiu versio estas asociaj klasoj, "
-"kodgenerado por Ruby, eksternigeblaj tekoj, ŝalteblo inter klaso kaj interfaco, "
-"kaj multe pli.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indekso"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unika"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>La pli multaj diagramelementoj ne povas esti ŝanĝataj en sia grandeco. Ilia "
-"grandeco aŭtomate adaptiĝas al ĝia enhavo.\n"
-"Skatoloj, notoj kaj sekvencdiagraj mesaĝoj povas regrandiĝi, simple musklaku "
-"kaj trenu la ruĝan rektangulon.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Vi enigis nevalidan ento-atributan nomon."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Se vi volas aldoni jam ekzistantan klason al diagramo, simple trenu ĝian "
-"reprezenton de la arboperspektivo.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Ento-Atributa Nomo Nevalida"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>La refaktora agento de Umbrello permesas la movadon de operacioj inter klaso "
-"kaj ĝia derivita kaj baza \n"
-"klaso.\n"
-"Dekstre musklaku al klaso por malfermi la refaktorilon.</p>\n"
+"La ento-atributa nomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Sekvencdiagramaj objektoj povas havi malkonstruan skatolon kaj povas esti "
-"pentrataj kiel aktoroj.  Duoble musklaku tian por \n"
-"alvoki ties trajtodialogon.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Ento-Atributa Nomo Ne Unika"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sekvencdiagramaj mesaĝoj povas funkcii kiel konstruktoroj.  Musklaku al "
-"objekta skatolo (anstataŭ ol la vertikala linio) por igi ĝin konstruktoro.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operaciaj Trajtoj"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sekvencdiagramoj subtenas mesaĝojn al memo.  Musklaku al sama vertikala "
-"linio refoje por krei memmesaĝon.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstrakta operacio"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Se ŝarĝante fremdan dosieron nenio montriĝas en la listoperspektivo, provu "
-"savi la modelon sub alia nomo, \n"
-"fermu, kaj reŝarĝu la savitan dosieron.  Kutime tiam la listperspektivo estas "
-"korekte plenigata.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "Nur-lega (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametroj"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Asocioj ne nepre devas esti rektaj linioj. Duobla musklako al unu tia kreos "
-"moveblan punkton.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&va Parametro..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Vi povas enŝalti aŭtomatan dosiersavadon en la dialogo Konfiguri "
-"Umbrello.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Vi enigis nevalidan parametronomon."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Ĉu mankas en Umbrello iu kapablo kiun vi bezonas? Bonvolu sciigi tion al ni. "
-"\n"
-"Aŭ aldonu ĝin al la cimbazo pere de Raporti Cimon de la menuo Helpo\n"
-"aŭ sendu ĝin al la e-poŝta listo uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parametronomo Nevalida"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Vi povas forigi ĉiujn selektitajn objektojn per premo de Del aŭ "
-"Backspace.</p>\n"
+"La parametronomo kiun vi elektis\n"
+"estas jam uzata en ĉi tiu operacio."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Se vi trovis cimon en Umbrello, bonvolu sciigu tion al ni. \n"
-"Vi povas sendi cimojn per la elekto \"Raportu eraron\" en la Helpomenuo.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parametronomo Ne Unika"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 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 ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "La parametronomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Vi enigis nevalidan operacinomon."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operacia Nomo Nevalida"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operacio kun tiu signaturo jam ekzistas en %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Elektu diversan nomon aŭ parametroliston."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Roltrajtoj"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Ŝablonaj Trajtoj"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Vi enigis nevalidan ŝablononomon"
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Ŝablononomo Nevalida"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Vi povas selekti ĉiujn objektojn premante Ctrl-A.</p>\n"
+"La ŝablona parametronomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Ŝablononomo Ne Unika"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opcioj por Montrado de Klasoj"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagramkoloroj"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "La nomo kiun vi enigis estas nevalida."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "La nomo kiun vi enigis ne estas unika."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nomo Ne Unika"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linio:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Plenigo:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Aŭtomata"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Uzi plenigon"
 
-#: tips.txt:108
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Eksportanta ĉiujn bildojn..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Iuj eraroj okazis dum la eksportado de la bildoj:"
+
+#: 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 "Problemo dum la savado de la dosiero: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Savo-Eraro"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Aŭtonoma generilo por Umbrello UML Modeller"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Dosiero transformenda"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "La dosiero XSLT uzenda"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Vi povas krei kaj pritrakti novan klason en la Sorĉisto por Nova Klaso de la "
-"menuo Kodo.</p>\n"
+"(k) 2006 Gael de Chalendar (aka Kleag), (k) 2002-2006 Aŭtoroj de Umbrello "
+"UML Modeller"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Aŭtoroj de Umbrello UML Modeller"
+
+#: 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 "Nomo"
+
+#: 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 "Enigi nomon:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Enigi operacian nomon:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Enigi novan tekston:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERARO"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Ŝanĝi Tekston"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "La tekdosiero %1 ne ekzistas."
+
+#: 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 "Eraro dum Ŝarĝado"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Ne eblas malfermi la tekdosieron %1."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1680,6 +1817,10 @@ msgstr "Nova Operacio..."
 msgid "Select Operation..."
 msgstr "Selekti Operacion..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Ŝanĝi Tektston..."
@@ -1731,6 +1872,19 @@ msgstr "Nova"
 msgid "Rename..."
 msgstr "Renomi..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Eraro dum Regluado"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Linia Koloro..."
@@ -1759,14 +1913,26 @@ msgstr "Internigi Tekon"
 msgid "Import Classes..."
 msgstr "Importi Klasojn..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pako"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Subsistemo"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefaraĵo"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponantdiagramo..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nodo"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Sterndiagramo..."
@@ -1775,10 +1941,18 @@ msgstr "Sterndiagramo..."
 msgid "Folder"
 msgstr "Teko"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Ento"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Ento-Rilata Diagramo..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktoro"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Uzkazdiagramo..."
@@ -1815,6 +1989,18 @@ msgstr "Nova Ento-Atributo..."
 msgid "Export as Picture..."
 msgstr "Eksporti kiel Bildon..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfaco"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datumtipo"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enum"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klasdiagramo..."
@@ -1835,26 +2021,10 @@ msgstr "Sekvencdiagramo..."
 msgid "Collaboration Diagram..."
 msgstr "Kunlabordiagramo..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributoj"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacioj"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Nur Publika"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Videblo"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operacia Signaturo"
@@ -1867,11 +2037,6 @@ msgstr "Atributa Signaturo"
 msgid "Stereotype"
 msgstr "Stereotipo"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Montri"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atributo..."
@@ -1896,14 +2061,6 @@ msgstr "Pleniga Koloro..."
 msgid "Use Fill Color"
 msgstr "Uzi Plenigan Koloron"
 
-#: 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 "Koloro"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktoro..."
@@ -1932,10 +2089,26 @@ msgstr "Enum..."
 msgid "Package..."
 msgstr "Pako..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Komenca Stato"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Fina Stato"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stato..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Komenca Aktiveco"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Fina Aktiveco"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Subsistemo..."
@@ -1980,6 +2153,14 @@ msgstr "Forigi Ankron"
 msgid "Change Association Name..."
 msgstr "Ŝanĝi Asocian Nomon..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Viŝi Diagramon"
@@ -2014,199 +2195,106 @@ msgstr "la dosierujo de la dosiero"
 
 #: 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 ""
-"reteni la arbostrukturon uzata por la storado de la diagramoj en la dokumento "
-"de la celdosierujo"
+"reteni la arbostrukturon uzata por la storado de la diagramoj en la "
+"dokumento de la celdosierujo"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(k) 2001 Paul Hensgen, (k) 2002-2006 Aŭtoroj de Umbrello UML Modeller"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Neĝusta uzo de asocioj."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Eraro pri Asocio"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "La tekdosiero %1 ne ekzistas."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Ne eblas malfermi la tekdosieron %1."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Oliver Kellogg"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "okellogg@users.sourceforge.net"
-
-#: 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 "Preta."
-
-#: 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 ""
-"Tenu aŭ Shift aŭ Ctrl por moviĝi X-akse. Tenu kaj Shift kaj Ctrl por moviĝi "
-"Y-akse.Dekstra musbutono nuligas la movon."
-
-#: 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 ""
-"Tenu aŭ Shift aŭ Ctrl por moviĝi X-akse. Tenu kaj Shift kaj Ctrl por moviĝi "
-"Y-akse.Dekstra musbutono nuligas la movon."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Ĉu la regiono %1 estas nomspaco aŭ klaso?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ Importo Postulas Vian Helpon"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Nomspaco"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importante dosieron: %1 Progreso: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nova_aktoro"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr ""
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nova_uzkazo"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nova_pako"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr ""
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nova_komponanto"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nova_nodo"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr ""
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nova_artefaraĵo"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nova_interfaco"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nova_datumtipo"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr ""
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nova_enum"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nova_ento"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nova_teko"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nova_asocio"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nova_objekto"
 
-#: 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 "Malplena"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr ""
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Misformita argumento"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Nekonata argumentotipo"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nepermesita nomo de metodo"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr ""
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Nekonata rezultotipo"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr ""
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Nespecifita eraro"
 
-#: 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 ""
+"Tio estas rezervita ŝlosilvorto de la programlingvo de la aktiva "
+"kodgeneratoro."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr ""
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Rezervita Ŝlosilvorto"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2220,104 +2308,66 @@ msgstr "Enigu objektnomon:"
 msgid "new_parameter"
 msgstr "nova_parametro"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Ĝeneralaj Fiksaĵoj"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Pako formas nomspacon"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtualaj malkonstruiloj"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generi malplenajn konstruilojn"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generi alirmetodojn"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operacioj estas enliniaj"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Alirmetodoj estas enliniaj"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Alirmetodoj estas publikaj"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagramo: %2 Paĝo %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Enigi Nomon de Diagramo"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Aldoni Bazklason"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Enigu la novan nomon de la diagramo:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Aldoni Derivitan Klason"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Vi estas forigonta la tutan diagramon.\n"
-"Ĉu vi certas?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Aldoni Operacion"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Forigi Diagramon?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Aldoni Atributon"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Renomado nuligita"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Aldoni Bazinterfacon"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Renomado de listperspektiva tipo %1 estas ankoraŭ ne realigita."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Aldoni Derivitan Interfacon"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkcio Ne Realigita"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Bazaj Klasifikiloj"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"La nomo kiun vi enigis estis nevalida.La renomada proceduro estas nuligita."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Derivitaj Klasifikiloj"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nova_asocio"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Enigi Nomon de Stato"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nova_atributo"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Enigi nomon de nova stato"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nova_ŝablono"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Enigu Aktivecon"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operacio"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Neĝusta uzo de asocioj."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nova_literalo"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Eraro pri Asocio"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nova_kampo"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nova stato"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2471,11 +2521,6 @@ msgstr "&Eksporti kiel Bildo..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Eksporti Ĉiujn &Diagramojn kiel Bildoj..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Trajtoj"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Zomŝovilo"
@@ -2560,14 +2605,21 @@ msgstr "&Dokumentaro"
 msgid "Opening file..."
 msgstr "Malfermanta dosieron..."
 
+#: 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 "Kreanta novan dokumenton..."
 
 #: 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"
@@ -2594,6 +2646,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2602,6 +2658,10 @@ msgstr ""
 "La dosiero %1 ekzistas.\n"
 "Ĉu vi volas superskribi ĝin?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Superskribi"
@@ -2637,11 +2697,11 @@ msgstr "Enmetanta tondujan enhavon..."
 
 #: 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 ""
-"Umbrello ne povis reglui la tondujan enhavon.  La objektoj en la tondujo povus "
-"esti de maltaŭga tipo por ĉi regluado."
+"Umbrello ne povis reglui la tondujan enhavon.  La objektoj en la tondujo "
+"povus esti de maltaŭga tipo por ĉi regluado."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2695,1263 +2755,1305 @@ msgstr "Ĉiuj Dosieroj"
 msgid "Select Code to Import"
 msgstr "Selekti Kodon por Importado"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Klas&nomo:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Aktor&nomo:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nova_atributo"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Pako&nomo:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nova_ŝablono"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Uzkaz&nomo:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operacio"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Interfac&nomo:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nova_literalo"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponant&nomo:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nova_kampo"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artefaraĵ&nomo:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML Modelo"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Enum-&nomo"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logika  Perspektivo"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datumtip&nomo:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Uzkaza Perspektivo"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Ento&nomo:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponanta Perspektivo"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotipnomo:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Sterna Perspektivo"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Pako&nomo:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Ento-Rilata Perspektivo"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstrakta klaso"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datumtipoj"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstrakta uzkazo"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"La aktuala dosiero estas modifita.\n"
+"Ĉu vi volas savi ĝin?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Rulebla"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "La dosiero %1 ne ekzistas."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Pentri Kiel"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "La dosiero %1 ŝajnas esti koruptita."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Aŭtomata"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Umbrello ne trovis XMI-dosieron en la komprimita dosiero %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Biblioteko"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Okazis problemo dum la ŝarĝado de la eltirita dosiero: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabelo"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Problemo dum la ŝarĝado de la dosiero: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublika"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Okazis problemo alŝutante la dosieron: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivata"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "uzkazdiagramo"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tektita"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klasdiagramo"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentnivela"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sekvencdiagramo"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klasnomo:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "kunlabordiagramo"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instancnomo:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "statodiagramo"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Pentri kiel aktoro"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "aktivecdiagramo"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Multobla instanco"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponantdiagramo"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Montri malkonstruon"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "sterndiagramo"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponantnomo:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "ento-rilata diagramo"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nodnomo:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Tio estas nevalida nomo por diagramo."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotipa nomo:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Iu diagramo jam uzas tiun nomon."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"La nomo kiun vi elektis\n"
-"estas jam uzata.\n"
-"La nomo estis nuligita."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Nomo Ne Unika"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linio:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Plenigo:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Aŭtomata"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Uzi plenigon"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivecoj"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nova Aktiveco..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Renomi"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nova Aktiveco"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Renomi Aktivecon"
+"La nomo kiun vi enigis estis neunika.\n"
+"Ĉu tion vi intencis?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Enigu la novan nomon de la nova aktiveco:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Uzi Nomon"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Trajtoj de Asocio"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Enigi Novan Nomon"
 
-#: 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 "Ĝeneralaj Alĝustigoj"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Ĉu vi certas ke vi volas forigi la diagramon %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roloj"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Forigi Diagramon"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Alĝustiĝoj de Rolo"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Preparanta la dokumenton..."
 
-#: 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 "Elektoj pri Signaro"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Solvanta objektreferencojn..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Tiparo de Asocio"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Ŝarĝanta UML elementojn..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Ŝablonaj Trajtoj"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Ŝarĝanta diagramojn..."
 
-#: 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 "Ĝeneralaj Trajtoj"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipo:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Eksterigi Tekon"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nomo:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Enigi Modelnomon"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Vi enigis nevalidan ŝablononomon"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Enigu la novan nomon de la modelo:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Ŝablononomo Nevalida"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Perspektivoj"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"La ŝablona parametronomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Ŝablononomo Ne Unika"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Ento-Atributaj Trajtoj"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Aŭtomata valoro:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Longeco/Valoroj:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto inkremento"
+"La nomo kiun vi enigis estis nevalida.\n"
+"Kreadprocedo nuligita."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Permesi &nulon"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nomo Ne Valida"
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributoj:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"La nomo kiun vi enigis ne estis unika!\n"
+"Kreadprocedo nuligita."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksado"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Kreado Nuligita"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Neniu"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Ŝarĝanta Listoperspektivon..."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primara"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "La teko devas esti maplena antaŭ ĝia forigo."
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indekso"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Teko Ne Malplena"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unika"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Renomado nuligita"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Vi enigis nevalidan ento-atributan nomon."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Renomado de listperspektiva tipo %1 estas ankoraŭ ne realigita."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Ento-Atributa Nomo Nevalida"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkcio Ne Realigita"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistviewitem.cpp:478
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"La ento-atributa nomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Ento-Atributa Nomo Ne Unika"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Montrado"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opcioj por Montrado de Klasoj"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagramkoloroj"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "La nomo kiun vi enigis estas nevalida."
-
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "La nomo kiun vi enigis ne estas unika."
+"La nomo kiun vi enigis estis nevalida.La renomada proceduro estas nuligita."
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipo:"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagramo: %2 Paĝo %1"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Konfigurado de Umbrello"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Enigi Nomon de Diagramo"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Uzanto-Interfaco"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Enigu la novan nomon de la diagramo:"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Uzanto-Interfaca Konfigurado"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Vi estas forigonta la tutan diagramon.\n"
+"Ĉu vi certas?"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Linia koloro:"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Forigi Diagramon?"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Aŭtomata Koloro"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Eksportanta diagramon..."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Pleniga koloro:"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Eraro okazis dum la eksportado de la bildo:\n"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Aŭtomata Koloro"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"La selektita dosiero %1 jam ekzistas.\n"
+"Ĉu vi volas superskribi ĝin?"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Linia amplekso"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Dosiero Jam Ekzistas"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Aŭtomata Amplekso"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Ne eblas krei dosierujon: %1"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Uzi plenigan koloron"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ne eblas savi malplenan diagramon"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Enŝalti Malfaron"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Problemo okazis dum la savado de la diagramo en %1"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Uzi ikonlistajn diagramojn"
+#: 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 ""
+"Tenu aŭ Shift aŭ Ctrl por moviĝi X-akse. Tenu kaj Shift kaj Ctrl por moviĝi "
+"Y-akse.Dekstra musbutono nuligas la movon."
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Uzi novajn C++/Java/Ruby generilojn"
+#: 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 ""
+"Tenu aŭ Shift aŭ Ctrl por moviĝi X-akse. Tenu kaj Shift kaj Ctrl por moviĝi "
+"Y-akse.Dekstra musbutono nuligas la movon."
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Uzi rektangulajn liniojn por asocioj"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekto"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Aŭtosavi"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Sinkrona Mesaĝo"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Enŝalti aŭtosavadon"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Nesinkrona Mesaĝo"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Selekti tempintervalon por aŭtosavo (minutoj):"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etikedo"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Fiksi aŭtosavan sufikson:"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Noto"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>La aŭtosava dosiero estos ~/autosave.xmi se la aŭtosavado okazas antaŭ via "
-"permana savado de la dosiero.</p>"
-"<p>Se vi jam ĝin savis, la aŭtosava dosiero estos skribata en la saman tekon "
-"kiel la dosiero kaj estos nomata same kiel la dosiero, sekvata de la sufikso "
-"specifita.</p>"
-"<p>Se la sufikso samas al la sufikso de la dosiero, la aŭtosavado aŭtomate "
-"superskribos vian dosieron.</p></qt>"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Skatolo"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Startado"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Rilato"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Sta&rtemblemo"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Direktita Asocio"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "Sugesto de la &Tago"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementas (Ĝeneraligo/Realigo)"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Ŝarĝi lastan projekton"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Profunda Historio"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Starti novan projekton kun:"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Malprofunda Historio"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Neniu Diagramo"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Kuniĝi"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Klasdiagramo"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Disiĝi"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Uzkazdiagramo"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Kuniĝo"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sekvencdiagramo"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Elekto"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Kunlabordiagramo"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Aktivecotransiro"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Statodiagramo"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mesaĝo"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Aktivecdiagramo"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "NEDIFINITA"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponantdiagramo"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Selekti"
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Sterndiagramo"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Fiksaĵoj por Klaso"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Montri &videblon"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Montri atributojn"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
 msgstr "Montri operaciojn"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Montri stereotipon"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Montri atritbutsignaturon"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Viŝi Diagramon"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Montri pakon"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Komenca Amplekso"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Ĝeneraligo"
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Aŭtomata atribut-amplekso:"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Aŭtomata operaci-amplekso:"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kodgenerado"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nomo de Asocio"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Kodgeneraj Fiksaĵoj"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Kodmontrilaj Fiksaĵoj"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operaciaj Trajtoj"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstrakta operacio"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Aŭtomata"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Klasifikila amplekso (\"statika\")"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "Nur-lega (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&ektita"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementnivela"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stilo:"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametroj"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Kodgenerado por C++</p>"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&va Parametro..."
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Generado de Metodkorpoj"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Vi enigis nevalidan parametronomon."
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parametronomo Nevalida"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
 msgstr ""
-"La parametronomo kiun vi elektis\n"
-"estas jam uzata en ĉi tiu operacio."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parametronomo Ne Unika"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variablo</b>"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "La parametronomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Vi enigis nevalidan operacinomon."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operacia Nomo Nevalida"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
 msgstr ""
-"Operacio kun tiu signaturo jam ekzistas en %1.\n"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Elektu diversan nomon aŭ parametroliston."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Trajtoj de Rolo A"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Trajtoj de Rolo B"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Videblo de Rolo A"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Videblo de Rolo B"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klasnomo"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Ŝanĝeblo de Rolo A"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Ŝanĝeblo de Rolo B"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generado de Projekto"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Entenataj Elementoj"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Krei ANT konstrudokumenton"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Nota Dokumentaro"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Aŭto-Generi Metodojn"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ova Atributo..."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Malplenaj konstruiloj"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ova Operacio..."
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Alirmetodoj por asocioj"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Ŝablonoj"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Alirmetodoj por atributoj"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ova Ŝablono..."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "De Parenca Objekto"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum-Literaloj"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Aŭtomata videblo por atributaj aliriloj:"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ova Enum-Literalo..."
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Aŭtomata videblo por asociaj kampoj:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Ento-Atributoj"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "De Parenca Rolo"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ova Ento-Atributo..."
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Kodgenerado por Java</p>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Komenca aktiveco"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Dieso (#)"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Fina aktiveco"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Komenco-Fino (=begin  =end)"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tipo de aktiveco:"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Kodgenerado por Ruby</p>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nomo de aktiveco:"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Programlingvo"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Fenestraĵaj Koloroj"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Tekoj"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Atributaj Trajtoj"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Skribi ĉiujn generaĵojn al teko:"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Iniciata valoro:"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Superflugi..."
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Publika"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Super&flugi..."
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Vi enigis nevalidan atributnomon."
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Preni kapdosierojn el teko:"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Atributa Nomo Nevalida"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Dosieroj generitaj far la Kodgenerilo estos skribataj al tiu ĉi teko"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "La atributnomo kiun vi elektis estas jam uzata en ĉi tiu operacio."
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Atributnomo Ne Unika"
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Selekti Operacion"
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sekvenca nombro:"
-
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klasoperacio:"
-
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Laŭmenda operacio:"
-
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramoj"
-
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtro"
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Dosieroj de tiu ĉi teko etos uzataj kiel kapdosieroj en la generita kodo"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Aktuala diagramo"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Superskribado"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Ĉiuj &diagramoj"
+#: 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 ""
+"Se dosiero ekzistas kiu havas saman nomon kiel la \n"
+" far la kodgenerilo uzota, tiam:"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Selekti diagramojn"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "S&uperskribi"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tipo de diagramo"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Superskribi ekzistantajn dosierojn en la celteko"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selekto"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Dema&ndi"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Kunlaboro"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Se samnoma dosiero jam ekzistas, tiam demandu kion fari"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvenco"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Uzi alian nomon"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Sterno"
+#: 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 ""
+"Se dosiero jam ekzistas en la celteko, aŭtomate elekt alian nomon far "
+"algluado de sufikso al la dosiernomo"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Neniuj diagramoj estas selektitaj."
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatado"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Montradaj Opcioj"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linioj"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Atributaj Alĝustaĵoj"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Liniofina stilo:"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operaciaj Alĝustaĵoj"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Indenta tipo:"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Ŝablonaj Alĝustaĵoj"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Indenta kvanto:"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Enum-Literalaj Alĝustaĵoj"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Ento-Atributaj Alĝustaĵoj"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Alĝustaĵoj de Enhavo"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Asocioj"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Neniu indento"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klas-Asocioj"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabo"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operacioj"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Spaco"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Videblo"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Koncizeco de Komentoj"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Operacia signaturo"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Generi komentojn &po sekcio eĉ se sekcio estas \n"
+"malplena"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ko"
+#: 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/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributoj"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Generi dokumentadajn komentojn eĉ se malplenaj"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereotipo"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Generi komentojn por &klasa kaj metoda dokumentado eĉ se malplenaj"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Atr&ibut-signaturo"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Programlingvaj Opcioj"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Pentri kiel cirklon"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Kodgenera Sorĉisto"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Komenca stato"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Elektu Klasojn"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Fina stato"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Metu ĉiujn klasojn por kiuj kodo estu generota \n"
+"en la dekstran liston"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Statotipo:"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Aldoni klason por la kodgenerado"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Statonomo:"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Klasoj Elekktitaj"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Fenestraĵa Koloro"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Forigi klason de la Kodgenerado"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_klaso"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Klasoj Disponeblaj"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nova Klaso"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Statuso de Kodgenerado"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klas-Atributoj"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Premu la butonon Generi por komencigi la kodgeneradon"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klas-Operacioj"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Statuso de Generado"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parametraj Trajtoj"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Montri kaŝitajn blokojn"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Transdona Direkto"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">nomon de komponanto tien</p>"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
-"\"in\" signifas nur-lega parametro, \"out\" signifas nur-skriba parametro kaj "
-"\"inout\" signifas parametro legata kaj skribata."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generi"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Fini"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Montri bloktipon"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kodo Generita"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Koloroj"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ne Generita"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Signaro:"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ankoraŭ Ne Generita"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papero:"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "La dosierujo %1 ne ekzistas. Ĉu vi volas krei ĝin nun?"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Elektita:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Celdosierujo Ne Ekzistas"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UMLa objektbloko:</p>"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Krei Dosierujon"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Kaŝita bloko:</p>"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "&Ne Krei"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Neredaktebla teksto:</p>"
 
-#: 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 ""
-"La kreado de la dosierujo ne sukcesis.\n"
-"Bonvolu certigi ke vi havas skribpermeson al ĝia parenca dosierujo aŭ elekti "
-"alian, validan, dosierujon."
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Redaktebla teksto:</p>"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Eraro dum Kreado de Dosierujo"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagramtrajtoj"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Bonvolu elekti validan dosierujon."
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zomo:"
 
-#: 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/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
 msgstr ""
-"La celdosierujo ekzistas sed ne estas skribebla.\n"
-"Bonvolu doni la ĝustajn permesojn aŭ elekti alian dosierujon."
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Eraro dum Skribado al Celdosierujo"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 ne ŝajnas esti dosierujo. Bonvolu elekti validan dosierujon."
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Montri &kradon"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Bonvolu Elekti Validan Dosierujon"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Kon&grui al krado"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Cela Dosiero Jam Ekzistas"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Kradigi grandecon de komponantoj"
 
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 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."
+"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 ""
-"La datumaro %1 jam ekzistas en %2.\n"
-"\n"
-"Umbrello povas superskribi tiun dosieron, generi similan\n"
-"dosiernomon aŭ ne generi ĉi tiun dosieron."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Apliki al ĉiuj ceteraj dosieroj"
+"Kongruigi la grandecon de la komponantoj al multobloj de la krada "
+"interspaco.\n"
+"Se 'Kongrui al Krado' estas enŝaltita, komponanto ĉiuflanke kongruos al la "
+"krado."
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Superskribi"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Interspacado de krado:"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generi Similan Dosiernomon"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Ne Generi Dosieron"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Neniu Opcio Disponebla.</p>"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Amplekso de linioj:"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multeco"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Eksporti ĉiujn diagramojn"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Enigi multecon:"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Dosierujo por la savado de diagramoj:"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nomo de Asocio"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "La baza dosierujo por la savado de diagramoj"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Enigi nomon de asocio:"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Bildotipo:"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rolnomo"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Uzi &tekojn"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Enigi nomon de rolo:"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr ""
+"Krei en la celdosierujo la saman arbostrukturon kiel jam \n"
+"ekzistanta en la dokumento por la bildoj"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Enigi operacian nomon:"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
+msgstr ""
+"Ene de la dokumento, la bildoj estas storataj en tekoj. Uzante tiun ĉi "
+"opcion, la sama arbostrukturo de la dokumento rekonstruiĝos ĉe la elektita "
+"bazdosierujo.\n"
+"Nur tiuj teko kiuj kreiĝis far la uzanto ankaŭ kreiĝos en la bazdosierujo "
+"(teko de Logika Perspektivo, Uzkazperspektivo ktp. ne estos kreataj)."
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Enigi novan tekston:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Ŝanĝeblo de Rolo"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERARO"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Videblo de Rolo"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Ŝanĝi Tekston"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Eksporti"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Vicigi Maldekstre"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Vicigi Dekstre"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagramo"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Vicigi Supre"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nova"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Vicigi Malsupre"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "M&ontri"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Vicigi Vertikal-Centre"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zomo:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Vicigi Horizontal-Centre"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kodo"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Vicigi Vertikal-Distribue"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktiva Program&lingvo"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Vicigi Horizontal-Distribue"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Por la vicigado vi devas elekti almenaŭ 2 objektojn kiel klasoj aŭ aktoroj. Ne "
-"eblas vicigi asociojn."
+"<p>Bonvenon al Umbrello.</p>\n"
+"<p>UML-diagramoj permesas al vi desegni kaj dokumenti objektorientitajn "
+"programojn.  <a href=\"help:/umbrello\">La Manlibro de Umbrello</a> estas "
+"bona enkonduko al la uzado de UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Tio estas rezervita ŝlosilvorto de la programlingvo de la aktiva kodgeneratoro."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Rezervita Ŝlosilvorto"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Eksportanta diagramon..."
+"<p>Bonvenon al Umbrello 1.5.  Nova en ĉi tiu versio estas asociaj klasoj, "
+"kodgenerado por Ruby, eksternigeblaj tekoj, ŝalteblo inter klaso kaj "
+"interfaco, kaj multe pli.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Eraro okazis dum la eksportado de la bildo:\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"La selektita dosiero %1 jam ekzistas.\n"
-"Ĉu vi volas superskribi ĝin?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Dosiero Jam Ekzistas"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nova_aktoro"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nova_uzkazo"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nova_pako"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nova_komponanto"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nova_nodo"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nova_artefaraĵo"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nova_interfaco"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nova_datumtipo"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nova_enum"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nova_ento"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nova_teko"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nova_objekto"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Malplena"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Misformita argumento"
+"<p>La pli multaj diagramelementoj ne povas esti ŝanĝataj en sia grandeco. "
+"Ilia grandeco aŭtomate adaptiĝas al ĝia enhavo.\n"
+"Skatoloj, notoj kaj sekvencdiagraj mesaĝoj povas regrandiĝi, simple musklaku "
+"kaj trenu la ruĝan rektangulon.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Nekonata argumentotipo"
+#: 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 ""
+"<p>Se vi volas aldoni jam ekzistantan klason al diagramo, simple trenu ĝian "
+"reprezenton de la arboperspektivo.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nepermesita nomo de metodo"
+#: 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 ""
+"<p>La refaktora agento de Umbrello permesas la movadon de operacioj inter "
+"klaso kaj ĝia derivita kaj baza \n"
+"klaso.\n"
+"Dekstre musklaku al klaso por malfermi la refaktorilon.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Nekonata rezultotipo"
+#: 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 ""
+"<p>Sekvencdiagramaj objektoj povas havi malkonstruan skatolon kaj povas esti "
+"pentrataj kiel aktoroj.  Duoble musklaku tian por \n"
+"alvoki ties trajtodialogon.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Nespecifita eraro"
+#: 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 ""
+"<p>Sekvencdiagramaj mesaĝoj povas funkcii kiel konstruktoroj.  Musklaku al "
+"objekta skatolo (anstataŭ ol la vertikala linio) por igi ĝin konstruktoro.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Aldoni Bazklason"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Sekvencdiagramoj subtenas mesaĝojn al memo.  Musklaku al sama vertikala "
+"linio refoje por krei memmesaĝon.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Aldoni Derivitan Klason"
+#: 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 ""
+"<p>Se ŝarĝante fremdan dosieron nenio montriĝas en la listoperspektivo, "
+"provu savi la modelon sub alia nomo, \n"
+"fermu, kaj reŝarĝu la savitan dosieron.  Kutime tiam la listperspektivo "
+"estas korekte plenigata.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Aldoni Operacion"
+#: 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"
-msgstr "Aldoni Atributon"
+#: 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 ""
+"<p>Asocioj ne nepre devas esti rektaj linioj. Duobla musklako al unu tia "
+"kreos moveblan punkton.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Aldoni Bazinterfacon"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Vi povas enŝalti aŭtomatan dosiersavadon en la dialogo Konfiguri Umbrello."
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Aldoni Derivitan Interfacon"
+#: 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 ""
+"<p>Ĉu mankas en Umbrello iu kapablo kiun vi bezonas? Bonvolu sciigi tion al "
+"ni. \n"
+"Aŭ aldonu ĝin al la cimbazo pere de Raporti Cimon de la menuo Helpo\n"
+"aŭ sendu ĝin al la e-poŝta listo uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Bazaj Klasifikiloj"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Vi povas forigi ĉiujn selektitajn objektojn per premo de Del aŭ Backspace."
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Derivitaj Klasifikiloj"
+#: 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 ""
+"<p>Se vi trovis cimon en Umbrello, bonvolu sciigu tion al ni. \n"
+"Vi povas sendi cimojn per la elekto \"Raportu eraron\" en la Helpomenuo.</"
+"p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Ne eblas krei dosierujon: %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"
-msgstr "Ne eblas savi malplenan diagramon"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Vi povas selekti ĉiujn objektojn premante Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Problemo okazis dum la savado de la diagramo en %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 ""
+"<p>Vi povas krei kaj pritrakti novan klason en la Sorĉisto por Nova Klaso de "
+"la menuo Kodo.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "nova_stereotipo"
diff --git a/tde-i18n-es/messages/tdesdk/umbrello.po b/tde-i18n-es/messages/tdesdk/umbrello.po
index 45b3277d3c2..e3a3259b15a 100644
--- a/tde-i18n-es/messages/tdesdk/umbrello.po
+++ b/tde-i18n-es/messages/tdesdk/umbrello.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-08-16 16:46+0200\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -20,245 +20,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Generador de código autónomo del modelador de UML Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Archivo a transformar"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "El archivo XSLT a usar"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (alias Kleag), (c) 2002-2006 los Autores del "
-"modelador de UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autores del modelador de UML Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Eloy Cuadra,Pablo de Vicente"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Exportar todas las vistas..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "ecuadra@eloihr.net,p.devicente@wanadoo.es"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Se han generado algunos errores al exportar las imágenes:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Introduzca nombre de la actividad."
 
-#: 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 "Ha habido un problema guardando el archivo: %1 "
+#: 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 "Introduzca el nombre de la nueva actividad:"
 
-#: 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 "Error al guardar"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Alinear a la izquierda"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objeto"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Alinear a la derecha"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Mensaje síncrono"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Alinear arriba"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Mensaje asíncrono"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alinear abajo"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Asociación"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Alinear en medio verticalmente"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Contención"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Alinear en medio horizontalmente"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Anclaje"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Alinear en medio verticalmente"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etiqueta"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Alinear en medio horizontalmente"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Nota"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Para la alineación debe elegir al menos 2 objetos como clases o actores. No "
+"puede alinear asociaciones."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Caja"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formato"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dependencia"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalización"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregación"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relación"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Asociación direccional"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementa (generalización/realización)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composición"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Caso de uso"
-
-#. 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 "Clase"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Estado inicial"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Estado final"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Ramificar/fusionar"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Bifurcar/unir"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paquete"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Componente"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nodo"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dependencia"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefacto"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Asociación"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfaz"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Auto asociación"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tipo de dato"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Mensaje de colaboración"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumerado"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Mensaje de secuencia"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entidad"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Auto mensaje de colaboración"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Historia profunda"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Auto mensaje de secuencia"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Historia superficial"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Contención"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Unir"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composición"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Bifurcar"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realización"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Unión"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni asociación"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Elección"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Anclaje"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Transición de estado"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Transición de actividad"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Actividad"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Estado"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicidad"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Actividad final"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Introducir multiplicidad:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Actividad inicial"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nombre de asociación"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mensaje"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Introduzca nombre de asociación:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "No definido"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nombre de rol"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Selección"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Introducir nombre de rol:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Ya existe una operación con ese mismo nombre y firma. No puede añadirla de "
+"nuevo."
+
+#: 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 "Este nombre no es válido"
+
+#: 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 "Nombre no válido"
+
+#: 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 "Ese nombre ya está siendo usado."
+
+#: 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 "No un nombre único"
 
 #: 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."
+"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 ""
 "Al menos uno de los elementos del portapapeles no pudo ser pegado porque ya "
 "existe otro elemento con el mismo nombre. Los demás elementos sí han sido "
@@ -281,10 +241,8 @@ msgid "Cannot Open File"
 msgstr "No se pudo abrir el archivo"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"No se puedo crear la carpeta:\n"
+msgid "Cannot create the folder:\n"
+msgstr "No se puedo crear la carpeta:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -298,1358 +256,1524 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "No se pudo crear la carpeta"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Introduzca nombre del estado"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Opciones generales"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Introduzca el nombre del nuevo estado:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "El paquete es un espacio de nombres"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Introduzca actividad"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Destructores virtuales"
 
-#: 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 "Introduzca el nombre de la nueva actividad:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generar constructores vacíos"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nueva actividad"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generar métodos accesores"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Modelo UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Las operaciones son inline"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Vista lógica"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Los accesores son inline"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Vista de casos de uso"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Los accesores son públicos"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Vista de componentes"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importando archivo: %1 Progreso: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Vista de despliegue"
+#: 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 "Listo."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Modelo entidad relación"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "¿Es la vista %1 un espacio de nombres o una clase?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipo de datos"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "La importación de C++ requiere su ayuda"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"El archivo actual ha sido modificado.\n"
-"¿Desea guardarlo?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Espacio de nombres"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "El archivo %1 no existe"
+#: 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 "Clase"
 
-#: 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 "Error de carga"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Error interno"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Parece que el archivo %1 está dañado."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Error de sintaxis antes de «%1»"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "No se ha encontrado un archivo XMI en el archivo comprimido %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Error de análisis sintáctico antes de «%1»"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Ha habido un problema cargando el archivo extraido: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Ha habido un problema cargando el archivo: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "expresión esperada"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Ha habido un problema subiendo el archivo: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Error en sintaxis de declaración"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagrama de casos de uso"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "falta }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagrama de clase"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "falta espacio de nombres"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagrama de secuencia"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "falta {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagrama de colaboración"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Falta nombre del espacio de nombres"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagrama de estado"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Necesita especificar un tipo a declarar"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagrama de actividades"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "falta una declaración"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagrama de componentes"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Falta una expresión constante"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagrama de despliegue"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "falta «)»"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagrama de relación de entidades"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "falta }"
 
-#: 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 "Nombre"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Faltan inicializadores de miembro"
 
-#: 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 "Introduzca nombre:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Falta especificador de clases base"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Ese no es un nombre válido para un diagrama."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Falta cláusula inicializadora"
 
-#: 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 "Nombre no válido"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Falta identificador"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Ya hay un diagrama usando ese nombre."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Falta id de tipo"
 
-#: 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 "No un nombre único"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Falta nombre de clase"
 
-#: 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 "Este nombre no es válido"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "Falta condición"
 
-#: 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 "Ese nombre ya está siendo usado."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "Falta declaración"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"El nombre que introdujo no era único.\n"
-"¿Era esto lo que quería?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "Falta inicialización del «for»"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nombre no único"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "Falta «catch»"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Usar nombre"
+#: 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 "&Propiedades"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Introducir nuevo nombre"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Actividad inicial"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "¿Está seguro de querer borrar el diagrama %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Actividad final"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Eliminar diagrama"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Ramificar/fusionar"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Configurando el documento..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Bifurcar/unir"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Resolviendo referencias a objetos..."
+#: 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 "General"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Cargando elementos UML..."
+#: 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 "Propiedades generales"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Cargando diagramas..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tipo de actividad:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagrama"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nombre de actividad:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autoguardado%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 "Documentación"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Externalizar carpeta"
+#: 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 "Tipo de letra:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Introduzca nombre del modelo"
+#: 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 "Preferencias del tipo de letra"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Introduzca el nuevo nombre del modelo:"
+#: 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 "Color"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vistas"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Colores del widget"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"El nombre que intrudujo no es válido\n"
-"El proceso de creación ha sido cancelado."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Actividades"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nombre no válido"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nueva actividad..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"El nombre que ha introducido no era único.\n"
-"El proceso de creación ha sido cancelado."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Eliminar anclaje"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Creación cancelada"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Cambiar nombre"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Cargando vista de lista..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nueva actividad"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "La carpeta debe de vaciarse antes de ser eliminada."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nueva actividad"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Carpeta no vacía"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Cambiar nombre de actividad"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Ya existe una operación con ese mismo nombre y firma. No puede añadirla de "
-"nuevo."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Introduzca el nuevo nombre de la actividad:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Introduzca nombre de la actividad."
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nombre:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nuevo estado"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipo:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalización"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Asociaciones"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Auto asociación"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Propiedades de las asociaciones"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Mensaje de colaboración"
+#: 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 "Preferencias generales"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Mensaje de secuencia"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roles"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Auto mensaje de colaboración"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Preferencias de rol"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Auto mensaje de secuencia"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Tipo de letra para asociación"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realización"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Propiedades del rol A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni asociación"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Propiedades del rol B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportar"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Visibilidad del rol A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagrama"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Visibilidad del rol B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nuevo"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Variabilidad del rol A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "M&ostrar"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Variabilidad del rol B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Código"
+msgid "Rolename:"
+msgstr "Nombre de rol:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Activar &lenguaje"
+msgid "Multiplicity:"
+msgstr "Multiplicidad:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentación"
+msgid "Public"
+msgstr "Público"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Barra-barra (//)"
+msgid "Private"
+msgstr "Privado"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Barra-estrella (/**  */)"
+msgid "Protected"
+msgstr "Protegido"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Estilo:"
+msgid "Implementation"
+msgstr "Implementación"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\"> Generación de código C++</p>"
+msgid "Changeable"
+msgstr "Variable"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "General"
+msgid "Frozen"
+msgstr "Inmutable"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Generación del cuerpo del método"
+msgid "Add only"
+msgstr "Solo añadir"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Usar lo siguiente para las clases en el código generado:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nombre de clase:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nombre de actor:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nombre de paquete:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nombre de caso de uso:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nombre de interfaz:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nombre de componente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "cadena (string)"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nombre de artefacto:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Cadena</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Nombre de enumerado:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nombre de tipo de dato:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nombre de entidad:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>¿global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Nombre de e&sterotipo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Nombre de &paquete:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nombre de clase"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Clase a&bstracta"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<p align=\"center\">Archivo include</p>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Caso de uso a&bstracto"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generación de proyecto"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Ejecutable"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Crear documento de construcción ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Dibujar como"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Auto-generar métodos"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Pre&determinado"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Métodos constructores vacíos"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Re&lleno:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Métodos accesores de asociación"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&lioteca"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Métodos accesores de atributo"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabla"
 
-#. 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 "Público"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibilidad"
 
-#. 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 "Privado"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "Púb&lico"
 
-#. 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 "Protegido"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivado"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Desde objeto padre"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tegido"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Ámbito predeterminado del accesor de atributo:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentación"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Ámbito predeterminado del campo de asociación:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nombre de clase:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Desde rol padre"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nombre de instancia:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generación de código Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Dibujar como actor"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hash (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Instancia múltiple"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Inicio-Fin (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Mostrar destrucción"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generación de código Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nombre de componente:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nombre de nodo:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nombre de esterotipo:"
+
+#: 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 ""
+"El nombre que ha elegido\n"
+"ya está siendo usado.\n"
+"El nombre será reiniciado."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "El nombre no es único"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributos"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Nu&evo atributo..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operaciones"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nu&eva operación..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Plantillas"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Nu&eva plantilla..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Literales enumerados"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Nu&evo literal enumerado..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributos de la entidad"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Nu&evo atributo de entidad..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Eliminar anclaje"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Propiedades"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Mostrar"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operacio&nes"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibilidad"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Firma de la o&peración"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&quete"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributos"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Estereotipo"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Firma del atr&ibuto"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Dibujar como círculo"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Visualización"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opciones de visualización"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Preferencias del atributo"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Preferencias de la operación"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Preferencias de plantillas"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Preferencias de literales de enumeración"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Preferencias de atributos de entidad"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Contención"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Preferencias de contenidos"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Asociaciones de clase"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nueva_clase"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nueva clase"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributos de clase"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operaciones de clase"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Opciones de generación de código"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Lenguaje"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Carpetas"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Finalizar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Escribir todos los archivos generados en la carpeta:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Código generado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Examinar..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "No generado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "E&xaminar..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "No generado aún"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Incluir archivos de cabecera de la carpeta:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "La carpeta %1 no existe. ¿Desea crearla ahora?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Los archivos generados con el generador de código se guardarán en esta carpeta"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "La carpeta de salida no existe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Crear carpeta"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "No crear"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Los archivos de esta carpeta se usarán como archivos de cabecera en el código "
-"generado"
+"No se ha podido crear la carpeta.\n"
+"Asegúrese de que tiene permiso de escritura en la carpeta de nivel superior "
+"o seleccione otra carpeta válida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Política de sobrescritura"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Error al crear la carpeta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Seleccione una carpeta válida."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Si ya existe un archivo con el mismo nombre que\n"
-"usa el generador de código como archivo de salida:"
+"La carpeta de salida ya existe, pero no se puede escribir en ella.\n"
+"Ajuste los permisos adecuados o seleccione otra carpeta."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Sobrescribir"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Error al escribir en la carpeta de salida"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr ""
-"Sobrescribir los archivos existentes si ya existen en la carpeta de destino"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "Parece que %1 no es una carpeta. Seleccione una carpeta válida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Preguntar"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Seleccione una carpeta válida"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Si ya existe un archivo con el mismo nombre, preguntar qué hacer"
+msgid "Code Viewer"
+msgstr "Visor de código"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Usar un nombre diferente"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">No hay opciones disponibles.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Si un archivo ya existe en la carpeta de destino, seleccionar un nombre "
-"diferente añadiendo un sufijo al nombre del archivo."
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formato"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Líneas"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Diagrama a&ctual"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Estilo de fin de línea:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Todos los di&agramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Tipo de sangría:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Seleccionar diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Cantidad de sangrado:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tipo de diagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX («\\n»)"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selección"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows («\\r\\n»)"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Caso de uso"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac («\\r»)"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Colaboración"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Sin sangría"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Secuencia"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulador"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Estado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Espacio"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Componente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Detalle de los comentarios"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Despliegue"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "No hay diagramas seleccionados."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "El formato al que se exportarán las imágenes"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Documentación de nota"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Ya existe el archivo de destino"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Escribir comentarios &para las secciones incluso si la\n"
-"sección está vacía."
+"El archivo %1 ya existe en %2.\n"
+"\n"
+"Umbrello puede sobrescribir el archivo, generar un\n"
+"nombre de archivo similar, o no no generar este archivo."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Aplicar a todos los archivos restantes"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "S&obrescribir"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generar nombre de archivo similar"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&No generar archivo"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Propiedades del parámetro"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipo:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nombre:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Valor &inicial:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Dirección de paso"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Escribe comentarios para indicar las diferentes secciones (público, privado "
-"etc.) de una clase, incluso de las secciones están vacías"
+"«in» es un parámetro de solo lectura, «out» es un parámetro de solo "
+"escritura, e «inout» es un parámetro para leer y escribir."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Escribir comentarios de documentación incluso si está vacía"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Elementos contenidos"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Escribir comentarios para documentación de clases y método, incluso si está "
-"&vacía"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Seleccionar operación"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Opciones de lenguaje"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Número de secuencia:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Asistente de generación de código"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operaciones de clase:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Seleccionar clases"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Operación pesonalizada:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Configuración de Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interfaz de usuario"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Preferencias de la interfaz de usuario"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Color de línea:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Color pred&eterminado"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Color de relleno:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Color prede&terminado"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Ancho de línea:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Ancho pr&edeterminado"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Usar color de relleno:"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Ponga todas las clases para las que quiere generar código\n"
-"en la lista de la parte derecha"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Añadir clase para generación de código"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Activar deshacer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Clases seleccionadas"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Usar diagramas tabulados"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Eliminar clase de la generación de código"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Usar nuevos generadores de C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Clases disponibles"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Usar líneas de asociación angulares"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Estado de la generación de código"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Guardar automáticamente"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Pulse el botón Generación para comenzar la generación del código"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Activar guardar automáticamente"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Estado de la generación"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Intervalo de tiempo para guardar automáticamente (mins):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Visor de código"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Definir sufijo para guardar automáticamente:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Mostrar bloques ocultos"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>El archivo se guardará automáticamente en ~/autosave.xmi si se guarda "
+"de forma automática antes de que usted lo haya guardado manualmente.</"
+"p><p>Si ya lo había guardado con anterioridad, se guardará automáticamente "
+"en la misma carpeta en la que reside el archivo y con su mismo nombre "
+"seguido por el sufijo especificado.</p><p>Si el sufijo es igual al del "
+"archivo guardado, al guardarse automáticamente se sobrescribirá el archivo "
+"existente.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">nombre de componente aquí</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Inicio"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Mostrar tipo de bloque"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Logo de inicio"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Colores"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Consejo del día"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Tipo de letra:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Cargar último proyecto"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papel:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Comenzar nuevo proyecto con:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Seleccionado:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Sin diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Bloque de objeto UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagrama de clases"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Bloque oculto:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagrama de casos de uso"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Texto no editable:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagrama de secuencias"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Texto editable:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagrama de colaboración"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Propiedades del diagrama"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagrama de estados"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nombre:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagrama de actividades"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Ampliación:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagrama de componentes"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagrama de despliegue"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Preferencias de clase"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Mostrar &visibilidad"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Mostrar atributos"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Mostrar operaciones"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Mostrar es&tereotipo"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Mostrar firma del atributo"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Mostrar paquete"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Mostrar firma de la operación"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Mostrar re&jilla"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Ámbito de inicio"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Ajustar a la rejilla"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Ámbito predeterminado del atributo:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Ajustar tamaño del componente"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Ámbito predeterminado de la operación:"
 
-#. 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."
-msgstr ""
-"Ajustar el tamaño de los componenetes para ser múltiplo del espacio de la "
-"rejilla.\n"
-"Si se activa «Ajustar a la rejilla», los componentes siempre estarán alineados "
-"con la rejilla por los cuatro lados."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generación de código"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Espacio de rejilla:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Preferencias de generación de código"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Preferencias del visor de código"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Estado inicial"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Ancho de línea:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Estado final"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exportar todas las vistas"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tipo de estado:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Carpeta donde guardar los diagramas:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nombre de estado:"
 
-#. 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"
-msgstr "La carpeta base usada para guardar las imágenes"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Color de widget"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "T&ipo de imagen:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Propiedades de atributo"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "El formato al que se exportarán las imágenes"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Ámbito del &clasificador («estático»)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "&Usar carpetas"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Público"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Crear en la carpeta de destino la misma estructura de árbol\n"
-"usada en el documento para almacenar las vistas"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&egido"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementación"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Ha introducido un nombre de atributo no válido."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nombre de atributo no válido"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"Las vistas se almacenan en carpetas en el documento. La misma estructura de "
-"árbol usada en el documento para almacenar las vistas puede ser creada en la "
-"carpeta base seleccionada con esta opción.\n"
-"Solo las carpetas creadas por el usuario se crean en la carpeta base (la vista "
-"lógica, la vista de casos de uso y demás no se crean)."
+"El nombre de atributo que ha elegido ya está siendo usado en esta operación."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Propiedades del rol"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Nombre de atributo no único"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Nombre de rol:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Propiedades del atributo de entidad"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicidad:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Valor pre&determinado:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Variabilidad del rol"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Longitud/valores:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Solo añadir"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Autoincremento"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Inmutable"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Permitir &nulo"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Variable"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributos:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Visibilidad del rol"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexado"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementación"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Ninguno"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Bienvenido a Umbrello.</p>\n"
-"<p>Los diagramas UML le permiten diseñar y documentar programas orientados a "
-"objetos.  <a href=\"help:/umbrello\">El manual de Umbrello</a> "
-"es una buena introducción al uso de UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primario"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Bienvenido a Umbrello 1.5.  Esta versión tiene como novedad las clases de "
-"asociación, la generación de código Ruby, las carpetas externalizables, la "
-"capacidad de convertir interfaces en clases, y mucho más.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Índ&ice"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Los diagramas tabulados y las carpetas externalizadas son mutuamente "
-"exclusivos. Si necesita carpetas externas no debe seleccionar «Usar diagramas "
-"tabulados» en las preferencias generales.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "Úni&co"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>La mayoría de elementos de un diagrama no pueden ser redimensionados; ellos "
-"mismos se redimensionan para ajustarse a su contenido.\n"
-"Cajas, notas y mensajes de diagramas de secuencia pueden ser redimensionados, "
-"tan sólo pulse y arrastre sobre la esquina roja.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Ha introducido un nombre de atributo de entidad no válido."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Si quiere añadir una clase existente a un diagrama, solo tiene que arrastrar "
-"su entrada desde la vista de árbol</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nombre de atributo de entidad no válido"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>El agente de refactorización de Umbrello le permite mover operaciones entre "
-"una clase y sus clases derivadas y base.\n"
-"Pulse con el botón derecho sobre una clase para abrir el agente de "
-"refactorización.</p>\n"
+"El nombre de atributo de entidad que ha elegido ya está siendo usado en esta "
+"operación."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Los objetos del diagrama de secuencia pueden tener una caja de destructor y "
-"ser dibujados como actores. Pulse dos veces en uno\n"
-"para ver el diálogo de Propiedades.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Nombre de atributo de entidad no único"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Los mensajes de diagramas de secuencia pueden actuar como un constructor. "
-"Pulse en la caja del objeto (más bien sobre la línea vertical) para convertirlo "
-"en constructor.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Propiedades de operación"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Los diagramas de secuencia soportan mensajes a sí mismos. Pulse de nuevo en "
-"la misma línea vertical para crear un automensaje.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Operación &abstracta"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Si cargando un archivo externo no se muestra nada en la vista de lista, "
-"pruebe a guardar el modelo bajo un nombre diferente,\n"
-"ciérrelo, y recargue el archivo guardado. Normalmente la vista de lista se "
-"rellenará de forma correcta.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Petición («const»)"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Cortar y pegar puede exportar la imagen al portapapeles en formato PNG \n"
-"para posteriormente ser pegada en KWord u otras aplicaciones.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parámetros"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Las asociaciones no tienen por qué ir en líneas rectas, pulse dos veces en "
-"una para crear un punto movible.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Nue&vo parámetro..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Puede activar guardar automáticamente en el diálogo de configuración de "
-"Umbrello</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Ha introducido un nombre de parámetro no válido."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>¿Echa de menos alguna característica en Umbrello? Háganoslo saber.\n"
-"Añada fallos a la base de datos desde Informar de fallo en el menú Ayuda\n"
-"o envíelo a la lista de correo de desarrolladores de uml.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nombre de parámetro no válido."
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Puede borrar todos los objetos seleccionados pulsando las teclas Supr o "
-"Retroceso.</p>\n"
+"El nombre de parámetro que ha elegido\n"
+"ya está siendo usado en esta operación."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Si encuentra un fallo en Umbrello, háganoslo saber.\n"
-"Puede enviarnos fallos con la herramienta «Informar de fallo» del menú "
-"Ayuda.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Nombre de parámetro no único."
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Puede cambiar a la herramienta de selección pulsando la tecla Escape.\n"
-"Para volver a la herramienta anterior, pulse la tecla Retroceso.</p>\n"
+"El nombre de parámetro que ha elegido ya está siendo usado en esta operación."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Ha introducido un nombre de operación no válido."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nombre de operación no válido."
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Ya existe una operación con esa firma en %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Elija un nombre o lista de parámetro diferente."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Propiedades del rol"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Propiedades de plantilla"
 
-#: tips.txt:103
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Ha introducido un nombre de plantilla no válido."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nombre de plantilla no válido"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Puede seleccionar todos los objetos pulsando Ctrl-A</p>\n"
+"El nombre de parámetro de plantilla que ha elegido ya está siendo usado en "
+"esta operación."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Nombre de plantilla no único"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opciones de visualización de clases"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Colores del diagrama"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "El nombre que ha introducido no es válido."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "El nombre que ha introducido no es único."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nombre no único"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Línea:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Re&lleno:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Pred&eterminado"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Usar color de relleno"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Exportar todas las vistas..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Se han generado algunos errores al exportar las imágenes:"
+
+#: 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 "Ha habido un problema guardando el archivo: %1 "
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Error al guardar"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Generador de código autónomo del modelador de UML Umbrello"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Archivo a transformar"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "El archivo XSLT a usar"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Puede crear y configurar una nueva clase usando el Asistente de nueva clase "
-"en el menú Código</p>\n"
+"(c) 2006 Gael de Chalendar (alias Kleag), (c) 2002-2006 los Autores del "
+"modelador de UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autores del modelador de UML Umbrello"
+
+#: 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 "Nombre"
+
+#: 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 "Introduzca nombre:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Introduzca nombre de operación:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Introduzca el nuevo texto:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "Error"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Cambiar texto"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "El archivo de carpeta %1 no existe."
+
+#: 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 "Error de carga"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "El archivo de carpeta %1 no puede ser abierto."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1703,6 +1827,10 @@ msgstr "Nueva operación..."
 msgid "Select Operation..."
 msgstr "Seleccionar operación..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Cambiar texto..."
@@ -1754,6 +1882,19 @@ msgstr "Nuevo"
 msgid "Rename..."
 msgstr "Cambiar nombre..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Error al pegar"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Color de línea..."
@@ -1782,14 +1923,26 @@ msgstr "Internalizar carpeta"
 msgid "Import Classes..."
 msgstr "Importar clases..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paquete"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Subsistema"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefacto"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagrama de componentes..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nodo"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagrama de despliegue..."
@@ -1798,10 +1951,18 @@ msgstr "Diagrama de despliegue..."
 msgid "Folder"
 msgstr "Carpeta"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entidad"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagrama de relación de entidades..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Actor"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagrama de casos de uso..."
@@ -1838,6 +1999,18 @@ msgstr "Nuevo atributo de entidad..."
 msgid "Export as Picture..."
 msgstr "Exportar como imagen..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfaz"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tipo de dato"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumerado"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagrama de clase..."
@@ -1858,26 +2031,10 @@ msgstr "Diagrama de secuencias..."
 msgid "Collaboration Diagram..."
 msgstr "Diagrama de colaboración..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributos"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operaciones"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Solo público"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibilidad"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Firma de la operación"
@@ -1890,11 +2047,6 @@ msgstr "Firma del atributo"
 msgid "Stereotype"
 msgstr "Estereotipo"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Mostrar"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atributo..."
@@ -1919,14 +2071,6 @@ msgstr "Color de relleno..."
 msgid "Use Fill Color"
 msgstr "Usar color de relleno"
 
-#: 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 "Color"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Actor..."
@@ -1955,10 +2099,26 @@ msgstr "Enumerado..."
 msgid "Package..."
 msgstr "Paquete..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Estado inicial"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Estado final"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Estado..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Actividad inicial"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Actividad final"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Subsistema..."
@@ -2003,6 +2163,14 @@ msgstr "Eliminar anclaje"
 msgid "Change Association Name..."
 msgstr "Cambiar nombre de asociación..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Limpiar diagrama"
@@ -2037,11 +2205,11 @@ msgstr "La carpeta de los archivos"
 
 #: 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 ""
-"Mantener la estructura de árbol usada para almacenar las vistas del documento "
-"en la carpeta de destino"
+"Mantener la estructura de árbol usada para almacenar las vistas del "
+"documento en la carpeta de destino"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
@@ -2049,189 +2217,96 @@ msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 por los Autores del modelador de UML "
 "Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Uso incorrecto de asociaciones."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Error de asociación"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "El archivo de carpeta %1 no existe."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "El archivo de carpeta %1 no puede ser abierto."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Eloy Cuadra,Pablo de Vicente"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "ecuadra@eloihr.net,p.devicente@wanadoo.es"
-
-#: 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 "Listo."
-
-#: 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 ""
-"Pulse «Mayúsculas» o «Control» para mover en el eje X. Pulse ambas para mover "
-"en el eje Y. Clic con el botón derecho para cancelar."
-
-#: 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 ""
-"Pulse «Mayúsculas» o «Control» para mover en el eje X. Pulse ambas para mover "
-"en el eje Y. Clic con el botón derecho para cancelar."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "¿Es la vista %1 un espacio de nombres o una clase?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "La importación de C++ requiere su ayuda"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Espacio de nombres"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importando archivo: %1 Progreso: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Error interno"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Error de sintaxis antes de «%1»"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Error de análisis sintáctico antes de «%1»"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nuevo_actor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "expresión esperada"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nuevo_casodeuso"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Error en sintaxis de declaración"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nuevo_paquete"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "falta }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nueva_componente"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "falta espacio de nombres"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nuevo_nodo"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "falta {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nuevo_artefacto"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Falta nombre del espacio de nombres"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nueva_interfaz"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Necesita especificar un tipo a declarar"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nuevo_tipodato"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "falta una declaración"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nuevo_enumerado"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Falta una expresión constante"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nueva_entidad"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "falta «)»"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nueva_carpeta"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "falta }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nueva_asociación"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Faltan inicializadores de miembro"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nuevo_objeto"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Falta especificador de clases base"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Falta cláusula inicializadora"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Vacío"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Falta identificador"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argumento malformado"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Falta id de tipo"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tipo de argumento desconocido"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Falta nombre de clase"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nombre de método ilegal"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "Falta condición"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tipo de retorno desconocido"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "Falta declaración"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Error no especificado"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "Falta inicialización del «for»"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Esta palabra clave está reservada en el lenguaje del generador de código "
+"configurado."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "Falta «catch»"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Palabra clave reservada"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2245,107 +2320,66 @@ msgstr "Introduzca nombre del objeto:"
 msgid "new_parameter"
 msgstr "nuevo_parámetro"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Opciones generales"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "El paquete es un espacio de nombres"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Destructores virtuales"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generar constructores vacíos"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generar métodos accesores"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Las operaciones son inline"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Los accesores son inline"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Los accesores son públicos"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagrama: %2 Página %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Introduzca el nombre del diagrama"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Añadir clase base"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Introduzca el nuevo nombre del diagrama:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Añadir clase derivada"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Está a punto de eliminar todo el diagrama.\n"
-"¿Está seguro?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Añadir operación"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "¿Eliminar diagrama?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Añadir atributo"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Cambio de nombre cancelado"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Añadir interfaz base"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Aún no se ha implementado cambiar de nombre un elemento de una vista de lista "
-"de tipo %1."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Añadir interfaz derivada"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Función no implementada"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Clasificadores base"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"El nombre que introdujo no es válido.\n"
-"El proceso de cambio de nombre ha sido cancelado."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Clasificadores derivados"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nueva_asociación"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Introduzca nombre del estado"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nuevo_atributo"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Introduzca el nombre del nuevo estado:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nueva_plantilla"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Introduzca actividad"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nueva_operación"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Uso incorrecto de asociaciones."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nuevo_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Error de asociación"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nuevo_campo"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nuevo estado"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2499,11 +2533,6 @@ msgstr "&Exportar como imagen..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Export&ar todos los diagramas como imágenes..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Propiedades"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Barra de &zoom"
@@ -2588,21 +2617,28 @@ msgstr "&Documentación"
 msgid "Opening file..."
 msgstr "Abriendo archivo..."
 
+#: 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 "Creando nuevo documento..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Todos los archivos soportados (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Todos los archivos soportados (*.xmi, *."
+"xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Archivos XMI sin comprimir (*.xmi)\n"
 "*.xmi.tgz|Archivos XMI comprimidos con Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Archivos XMI comprimidos con Bzip2 (*.xmi.tar.bz2)\n"
@@ -2632,6 +2668,10 @@ msgstr ""
 "*.xmi.tar.bz2|Archivo XMI comprimido con Bzip2\n"
 "*|Todos los archivos"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2640,6 +2680,10 @@ msgstr ""
 "Ya existe el archivo %1.\n"
 "¿Desea sobrescribirlo?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Sobrescribir"
@@ -2675,8 +2719,8 @@ msgstr "Introduciendo contenidos del portapapeles..."
 
 #: 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 ""
 "Umbrello no pudo pegar el contenido del portapapeles. Los objetos en el "
 "portapapeles que intenta pegar aquí, deben de ser de un tipo incorrecto."
@@ -2734,1265 +2778,1319 @@ msgstr "Todos los archivos"
 msgid "Select Code to Import"
 msgstr "Seleccionar código a importar"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nombre de clase:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nombre de actor:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nuevo_atributo"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nombre de paquete:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nueva_plantilla"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nombre de caso de uso:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nueva_operación"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nombre de interfaz:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nuevo_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nombre de componente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nuevo_campo"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nombre de artefacto:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Modelo UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Nombre de enumerado:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Vista lógica"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nombre de tipo de dato:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Vista de casos de uso"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nombre de entidad:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Vista de componentes"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Nombre de e&sterotipo:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Vista de despliegue"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Nombre de &paquete:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Modelo entidad relación"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Clase a&bstracta"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipo de datos"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Caso de uso a&bstracto"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"El archivo actual ha sido modificado.\n"
+"¿Desea guardarlo?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Ejecutable"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "El archivo %1 no existe"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Dibujar como"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Parece que el archivo %1 está dañado."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Pre&determinado"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "No se ha encontrado un archivo XMI en el archivo comprimido %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&lioteca"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Ha habido un problema cargando el archivo extraido: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabla"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Ha habido un problema cargando el archivo: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "Púb&lico"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Ha habido un problema subiendo el archivo: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivado"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagrama de casos de uso"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tegido"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagrama de clase"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentación"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagrama de secuencia"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nombre de clase:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagrama de colaboración"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nombre de instancia:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagrama de estado"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Dibujar como actor"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagrama de actividades"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Instancia múltiple"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagrama de componentes"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Mostrar destrucción"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagrama de despliegue"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nombre de componente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagrama de relación de entidades"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nombre de nodo:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Ese no es un nombre válido para un diagrama."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nombre de esterotipo:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Ya hay un diagrama usando ese nombre."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"El nombre que ha elegido\n"
-"ya está siendo usado.\n"
-"El nombre será reiniciado."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "El nombre no es único"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Línea:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Re&lleno:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Pred&eterminado"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Usar color de relleno"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Actividades"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nueva actividad..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Cambiar nombre"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nueva actividad"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Cambiar nombre de actividad"
+"El nombre que introdujo no era único.\n"
+"¿Era esto lo que quería?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Introduzca el nuevo nombre de la actividad:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Usar nombre"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Propiedades de las asociaciones"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Introducir nuevo nombre"
 
-#: 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 "Preferencias generales"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "¿Está seguro de querer borrar el diagrama %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roles"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Eliminar diagrama"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Preferencias de rol"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Configurando el documento..."
 
-#: 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 "Preferencias del tipo de letra"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Resolviendo referencias a objetos..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Tipo de letra para asociación"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Cargando elementos UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Propiedades de plantilla"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Cargando diagramas..."
 
-#: 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 "Propiedades generales"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autoguardado%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipo:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externalizar carpeta"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nombre:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Introduzca nombre del modelo"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Ha introducido un nombre de plantilla no válido."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Introduzca el nuevo nombre del modelo:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nombre de plantilla no válido"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vistas"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"El nombre de parámetro de plantilla que ha elegido ya está siendo usado en esta "
-"operación."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Nombre de plantilla no único"
+"El nombre que intrudujo no es válido\n"
+"El proceso de creación ha sido cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Propiedades del atributo de entidad"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nombre no válido"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Valor pre&determinado:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"El nombre que ha introducido no era único.\n"
+"El proceso de creación ha sido cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Longitud/valores:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Creación cancelada"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Autoincremento"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Cargando vista de lista..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Permitir &nulo"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "La carpeta debe de vaciarse antes de ser eliminada."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributos:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Carpeta no vacía"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexado"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Cambio de nombre cancelado"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Ninguno"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Aún no se ha implementado cambiar de nombre un elemento de una vista de "
+"lista de tipo %1."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primario"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Función no implementada"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Índ&ice"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"El nombre que introdujo no es válido.\n"
+"El proceso de cambio de nombre ha sido cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "Úni&co"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagrama: %2 Página %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Ha introducido un nombre de atributo de entidad no válido."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Introduzca el nombre del diagrama"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nombre de atributo de entidad no válido"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Introduzca el nuevo nombre del diagrama:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"El nombre de atributo de entidad que ha elegido ya está siendo usado en esta "
-"operación."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Nombre de atributo de entidad no único"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Visualización"
+"Está a punto de eliminar todo el diagrama.\n"
+"¿Está seguro?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opciones de visualización de clases"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "¿Eliminar diagrama?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Colores del diagrama"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Exportando vista..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "El nombre que ha introducido no es válido."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Ha ocurrido un error al exportar la imagen:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "El nombre que ha introducido no es único."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Ya existe el archivo seleccionado %1.\n"
+"¿Quiere sobrescribirlo?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipo:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "El archivo ya existe"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Configuración de Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "No se ha podido crear la carpeta: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interfaz de usuario"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "No se puede guardar un diagrama vacío"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Preferencias de la interfaz de usuario"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Ha ocurrido un problema al guardar el diagrama en %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Color de línea:"
+#: 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 ""
+"Pulse «Mayúsculas» o «Control» para mover en el eje X. Pulse ambas para "
+"mover en el eje Y. Clic con el botón derecho para cancelar."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Color pred&eterminado"
+#: 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 ""
+"Pulse «Mayúsculas» o «Control» para mover en el eje X. Pulse ambas para "
+"mover en el eje Y. Clic con el botón derecho para cancelar."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Color de relleno:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objeto"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Color prede&terminado"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Mensaje síncrono"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Ancho de línea:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Mensaje asíncrono"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Ancho pr&edeterminado"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etiqueta"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Usar color de relleno:"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Nota"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Activar deshacer"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Caja"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Usar diagramas tabulados"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relación"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Usar nuevos generadores de C++/Java/Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Asociación direccional"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Usar líneas de asociación angulares"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementa (generalización/realización)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Guardar automáticamente"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Historia profunda"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Activar guardar automáticamente"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Historia superficial"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Intervalo de tiempo para guardar automáticamente (mins):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Unir"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Definir sufijo para guardar automáticamente:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Bifurcar"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>El archivo se guardará automáticamente en ~/autosave.xmi si se guarda de "
-"forma automática antes de que usted lo haya guardado manualmente.</p>"
-"<p>Si ya lo había guardado con anterioridad, se guardará automáticamente en la "
-"misma carpeta en la que reside el archivo y con su mismo nombre seguido por el "
-"sufijo especificado.</p>"
-"<p>Si el sufijo es igual al del archivo guardado, al guardarse automáticamente "
-"se sobrescribirá el archivo existente.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Unión"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Inicio"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Elección"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Logo de inicio"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Transición de actividad"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Consejo del día"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mensaje"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Cargar último proyecto"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "No definido"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Comenzar nuevo proyecto con:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Selección"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Sin diagrama"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagrama de clases"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagrama de casos de uso"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagrama de secuencias"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagrama de colaboración"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Mostrar operaciones"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagrama de estados"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagrama de actividades"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Limpiar diagrama"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagrama de componentes"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagrama de despliegue"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalización"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Preferencias de clase"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Mostrar &visibilidad"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Mostrar atributos"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nombre de asociación"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Mostrar operaciones"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Mostrar es&tereotipo"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Mostrar firma del atributo"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Mostrar paquete"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Pre&determinado"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Ámbito de inicio"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Ámbito predeterminado del atributo:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Barra-barra (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Ámbito predeterminado de la operación:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Barra-estrella (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generación de código"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Estilo:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Preferencias de generación de código"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\"> Generación de código C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Preferencias del visor de código"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Generación del cuerpo del método"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Propiedades de operación"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Usar lo siguiente para las clases en el código generado:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Operación &abstracta"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Ámbito del &clasificador («estático»)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Petición («const»)"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variable</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&egido"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementación"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parámetros"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "cadena (string)"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Nue&vo parámetro..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Cadena</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Ha introducido un nombre de parámetro no válido."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nombre de parámetro no válido."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"El nombre de parámetro que ha elegido\n"
-"ya está siendo usado en esta operación."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>¿global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Nombre de parámetro no único."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"El nombre de parámetro que ha elegido ya está siendo usado en esta operación."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nombre de clase"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Ha introducido un nombre de operación no válido."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<p align=\"center\">Archivo include</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nombre de operación no válido."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generación de proyecto"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Ya existe una operación con esa firma en %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Crear documento de construcción ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Elija un nombre o lista de parámetro diferente."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Auto-generar métodos"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Propiedades del rol A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Métodos constructores vacíos"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Propiedades del rol B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Métodos accesores de asociación"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Visibilidad del rol A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Métodos accesores de atributo"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Visibilidad del rol B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Desde objeto padre"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Variabilidad del rol A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Ámbito predeterminado del accesor de atributo:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Variabilidad del rol B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Ámbito predeterminado del campo de asociación:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Elementos contenidos"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Desde rol padre"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Documentación de nota"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generación de código Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Nu&evo atributo..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hash (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nu&eva operación..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Inicio-Fin (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Plantillas"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generación de código Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Nu&eva plantilla..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Lenguaje"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Literales enumerados"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Carpetas"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Nu&evo literal enumerado..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Escribir todos los archivos generados en la carpeta:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributos de la entidad"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Examinar..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Nu&evo atributo de entidad..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "E&xaminar..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Actividad inicial"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Incluir archivos de cabecera de la carpeta:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Actividad final"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Los archivos generados con el generador de código se guardarán en esta "
+"carpeta"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tipo de actividad:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Los archivos de esta carpeta se usarán como archivos de cabecera en el "
+"código generado"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nombre de actividad:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Política de sobrescritura"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Colores del widget"
+#: 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 ""
+"Si ya existe un archivo con el mismo nombre que\n"
+"usa el generador de código como archivo de salida:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Propiedades de atributo"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Sobrescribir"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Valor &inicial:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
+"Sobrescribir los archivos existentes si ya existen en la carpeta de destino"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Público"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Preguntar"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Ha introducido un nombre de atributo no válido."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Si ya existe un archivo con el mismo nombre, preguntar qué hacer"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nombre de atributo no válido"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Usar un nombre diferente"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"El nombre de atributo que ha elegido ya está siendo usado en esta operación."
+"Si un archivo ya existe en la carpeta de destino, seleccionar un nombre "
+"diferente añadiendo un sufijo al nombre del archivo."
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Nombre de atributo no único"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formato"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Seleccionar operación"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Líneas"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Número de secuencia:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Estilo de fin de línea:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operaciones de clase:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Tipo de sangría:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Operación pesonalizada:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Cantidad de sangrado:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramas"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX («\\n»)"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtro"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows («\\r\\n»)"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Diagrama a&ctual"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac («\\r»)"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Todos los di&agramas"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Sin sangría"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Seleccionar diagramas"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulador"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tipo de diagrama"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Espacio"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selección"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Detalle de los comentarios"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Colaboración"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Escribir comentarios &para las secciones incluso si la\n"
+"sección está vacía."
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Secuencia"
+#: 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 ""
+"Escribe comentarios para indicar las diferentes secciones (público, privado "
+"etc.) de una clase, incluso de las secciones están vacías"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Despliegue"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Escribir comentarios de documentación incluso si está vacía"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "No hay diagramas seleccionados."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Escribir comentarios para documentación de clases y método, incluso si está "
+"&vacía"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opciones de visualización"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Opciones de lenguaje"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Preferencias del atributo"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Asistente de generación de código"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Preferencias de la operación"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Seleccionar clases"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Preferencias de plantillas"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Ponga todas las clases para las que quiere generar código\n"
+"en la lista de la parte derecha"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Preferencias de literales de enumeración"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Añadir clase para generación de código"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Preferencias de atributos de entidad"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Clases seleccionadas"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Preferencias de contenidos"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Eliminar clase de la generación de código"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Asociaciones"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Clases disponibles"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Asociaciones de clase"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Estado de la generación de código"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operacio&nes"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Pulse el botón Generación para comenzar la generación del código"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibilidad"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Estado de la generación"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Firma de la o&peración"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Mostrar bloques ocultos"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&quete"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">nombre de componente aquí</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributos"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Estereotipo"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Mostrar tipo de bloque"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Firma del atr&ibuto"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Colores"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Dibujar como círculo"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Tipo de letra:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Estado inicial"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papel:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Estado final"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Seleccionado:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tipo de estado:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Bloque de objeto UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nombre de estado:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Bloque oculto:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Color de widget"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Texto no editable:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nueva_clase"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Texto editable:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nueva clase"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Propiedades del diagrama"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributos de clase"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Ampliación:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operaciones de clase"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Propiedades del parámetro"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Mostrar re&jilla"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Dirección de paso"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Ajustar a la rejilla"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Ajustar tamaño del componente"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"«in» es un parámetro de solo lectura, «out» es un parámetro de solo escritura, "
-"e «inout» es un parámetro para leer y escribir."
+"Ajustar el tamaño de los componenetes para ser múltiplo del espacio de la "
+"rejilla.\n"
+"Si se activa «Ajustar a la rejilla», los componentes siempre estarán "
+"alineados con la rejilla por los cuatro lados."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generar"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Espacio de rejilla:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Finalizar"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Código generado"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "No generado"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Ancho de línea:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "No generado aún"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exportar todas las vistas"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "La carpeta %1 no existe. ¿Desea crearla ahora?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Carpeta donde guardar los diagramas:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "La carpeta de salida no existe"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "La carpeta base usada para guardar las imágenes"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Crear carpeta"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "T&ipo de imagen:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "No crear"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "&Usar carpetas"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"No se ha podido crear la carpeta.\n"
-"Asegúrese de que tiene permiso de escritura en la carpeta de nivel superior o "
-"seleccione otra carpeta válida."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Error al crear la carpeta"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Seleccione una carpeta válida."
+"Crear en la carpeta de destino la misma estructura de árbol\n"
+"usada en el documento para almacenar las vistas"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"La carpeta de salida ya existe, pero no se puede escribir en ella.\n"
-"Ajuste los permisos adecuados o seleccione otra carpeta."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Error al escribir en la carpeta de salida"
+"Las vistas se almacenan en carpetas en el documento. La misma estructura de "
+"árbol usada en el documento para almacenar las vistas puede ser creada en la "
+"carpeta base seleccionada con esta opción.\n"
+"Solo las carpetas creadas por el usuario se crean en la carpeta base (la "
+"vista lógica, la vista de casos de uso y demás no se crean)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "Parece que %1 no es una carpeta. Seleccione una carpeta válida."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Variabilidad del rol"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Seleccione una carpeta válida"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Visibilidad del rol"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Ya existe el archivo de destino"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportar"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"El archivo %1 ya existe en %2.\n"
-"\n"
-"Umbrello puede sobrescribir el archivo, generar un\n"
-"nombre de archivo similar, o no no generar este archivo."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Aplicar a todos los archivos restantes"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "S&obrescribir"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generar nombre de archivo similar"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&No generar archivo"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">No hay opciones disponibles.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicidad"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Introducir multiplicidad:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nombre de asociación"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Introduzca nombre de asociación:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nombre de rol"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Introducir nombre de rol:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Introduzca nombre de operación:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Introduzca el nuevo texto:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "Error"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Cambiar texto"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Alinear a la izquierda"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Alinear a la derecha"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagrama"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Alinear arriba"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nuevo"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alinear abajo"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "M&ostrar"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Alinear en medio verticalmente"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Ampliación:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Alinear en medio horizontalmente"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Código"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Alinear en medio verticalmente"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Activar &lenguaje"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Alinear en medio horizontalmente"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Para la alineación debe elegir al menos 2 objetos como clases o actores. No "
-"puede alinear asociaciones."
+"<p>Bienvenido a Umbrello.</p>\n"
+"<p>Los diagramas UML le permiten diseñar y documentar programas orientados a "
+"objetos.  <a href=\"help:/umbrello\">El manual de Umbrello</a> es una buena "
+"introducción al uso de UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Esta palabra clave está reservada en el lenguaje del generador de código "
-"configurado."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Palabra clave reservada"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Exportando vista..."
+"<p>Bienvenido a Umbrello 1.5.  Esta versión tiene como novedad las clases de "
+"asociación, la generación de código Ruby, las carpetas externalizables, la "
+"capacidad de convertir interfaces en clases, y mucho más.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Ha ocurrido un error al exportar la imagen:\n"
+"<p>Los diagramas tabulados y las carpetas externalizadas son mutuamente "
+"exclusivos. Si necesita carpetas externas no debe seleccionar «Usar "
+"diagramas tabulados» en las preferencias generales.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Ya existe el archivo seleccionado %1.\n"
-"¿Quiere sobrescribirlo?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "El archivo ya existe"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nuevo_actor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nuevo_casodeuso"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nuevo_paquete"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nueva_componente"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nuevo_nodo"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nuevo_artefacto"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nueva_interfaz"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nuevo_tipodato"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nuevo_enumerado"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nueva_entidad"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nueva_carpeta"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nuevo_objeto"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Vacío"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argumento malformado"
+"<p>La mayoría de elementos de un diagrama no pueden ser redimensionados; "
+"ellos mismos se redimensionan para ajustarse a su contenido.\n"
+"Cajas, notas y mensajes de diagramas de secuencia pueden ser "
+"redimensionados, tan sólo pulse y arrastre sobre la esquina roja.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tipo de argumento desconocido"
+#: 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 ""
+"<p>Si quiere añadir una clase existente a un diagrama, solo tiene que "
+"arrastrar su entrada desde la vista de árbol</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nombre de método ilegal"
+#: 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 ""
+"<p>El agente de refactorización de Umbrello le permite mover operaciones "
+"entre una clase y sus clases derivadas y base.\n"
+"Pulse con el botón derecho sobre una clase para abrir el agente de "
+"refactorización.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tipo de retorno desconocido"
+#: 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 ""
+"<p>Los objetos del diagrama de secuencia pueden tener una caja de destructor "
+"y ser dibujados como actores. Pulse dos veces en uno\n"
+"para ver el diálogo de Propiedades.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Error no especificado"
+#: 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 ""
+"<p>Los mensajes de diagramas de secuencia pueden actuar como un constructor. "
+"Pulse en la caja del objeto (más bien sobre la línea vertical) para "
+"convertirlo en constructor.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Añadir clase base"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Los diagramas de secuencia soportan mensajes a sí mismos. Pulse de nuevo "
+"en la misma línea vertical para crear un automensaje.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Añadir clase derivada"
+#: 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 ""
+"<p>Si cargando un archivo externo no se muestra nada en la vista de lista, "
+"pruebe a guardar el modelo bajo un nombre diferente,\n"
+"ciérrelo, y recargue el archivo guardado. Normalmente la vista de lista se "
+"rellenará de forma correcta.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Añadir operación"
+#: 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 ""
+"<p>Cortar y pegar puede exportar la imagen al portapapeles en formato PNG \n"
+"para posteriormente ser pegada en KWord u otras aplicaciones.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Añadir atributo"
+#: 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 ""
+"<p>Las asociaciones no tienen por qué ir en líneas rectas, pulse dos veces "
+"en una para crear un punto movible.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Añadir interfaz base"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Puede activar guardar automáticamente en el diálogo de configuración de "
+"Umbrello</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Añadir interfaz derivada"
+#: 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 ""
+"<p>¿Echa de menos alguna característica en Umbrello? Háganoslo saber.\n"
+"Añada fallos a la base de datos desde Informar de fallo en el menú Ayuda\n"
+"o envíelo a la lista de correo de desarrolladores de uml.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Clasificadores base"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Puede borrar todos los objetos seleccionados pulsando las teclas Supr o "
+"Retroceso.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Clasificadores derivados"
+#: 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 ""
+"<p>Si encuentra un fallo en Umbrello, háganoslo saber.\n"
+"Puede enviarnos fallos con la herramienta «Informar de fallo» del menú Ayuda."
+"</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "No se ha podido crear la carpeta: %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 ""
+"<p>Puede cambiar a la herramienta de selección pulsando la tecla Escape.\n"
+"Para volver a la herramienta anterior, pulse la tecla Retroceso.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "No se puede guardar un diagrama vacío"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Puede seleccionar todos los objetos pulsando Ctrl-A</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Ha ocurrido un problema al guardar el diagrama en %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 ""
+"<p>Puede crear y configurar una nueva clase usando el Asistente de nueva "
+"clase en el menú Código</p>\n"
diff --git a/tde-i18n-et/messages/tdesdk/umbrello.po b/tde-i18n-et/messages/tdesdk/umbrello.po
index 7b12a5083ef..72803d39a1f 100644
--- a/tde-i18n-et/messages/tdesdk/umbrello.po
+++ b/tde-i18n-et/messages/tdesdk/umbrello.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-08-22 12:32+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -16,244 +16,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello autonoomne koodigeneraator"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Transformeeritav fail"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Kasutatav XSLT-fail"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006: Gael de Chalendar (aka Kleag), (c) 2002-2006: Umbrello autorid"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello autorid"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Peeter Russak"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Kõigi vaadete eksport..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "pezz@tkwcy.ee"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Piltide eksportimisel tekkis vigu:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Tegevuse nime sisestamine"
 
-#: 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 "Faili salvestamisel tekkis tõrge: %1"
+#: 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 "Sisesta uue tegevuse nimi:"
 
-#: 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 "Tõrge salvestamisel"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Vasakjoondus"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Paremjoondus"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Sünkroonne teade"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Ülajoondus"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asünkroonne teade"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alajoondus"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Side"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Püstine keskjoondus"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Sisaldab elemente"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Rõhtne keskjoondus"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ankur"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Püstine keskjaotus"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Pealdis"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Rõhtne keskjaotus"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Märkus"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Joonduse kasutamiseks tuleb valida vähemalt kaks objekti, näiteks klassid "
+"või tegijad. Sidemeid joondada ei saa."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kast"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Vormindamine"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Tegija"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Sõltuvus"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Üldistus"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregatsioon"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Seos"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Suunatud side"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Teostus (üldistus/realisatsioon)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompositsioon"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Kasutusklass"
-
-#. 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 "Klass"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Algolek"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Lõppolek"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Branch/Merge"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Fork/Join"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pakett"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponent"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Sõlm"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Sõltuvus"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Tehis"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Side"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Liides"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Side iseendale"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Andmetüüp"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Koostööteade"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Väärtustik"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Järgnevusteade"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Olem"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Koostööteade iseendale"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Süvaajalugu"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Järgnevusteade iseendale"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Lihtne ajalugu"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Sisaldab elemente"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Ühendus"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompositsioon"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Harunemine"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisatsioon"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Liidus"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Ühesuunaline side"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Valik"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ankur"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Oleku üleminek"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Tegevuse üleminek"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Tegevus"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Olek"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Mitmesus"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Lõpptegevus"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Sisesta mitmesus:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Algtegevus"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Sideme nimi"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Teade"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Sisesta sideme nimi:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "DEFINEERIMATA"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rolli nimi"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Valik"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Sisesta rolli nimi:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Sellise nime ja signatuuriga operatsioon on juba olemas. Seda ei saa uuesti "
+"lisada."
+
+#: 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 "See pole sobiv nimi."
+
+#: 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 "Sobimatu nimi"
+
+#: 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 "See nimi on juba kasutusel."
+
+#: 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 "Nimi pole unikaalne"
 
 #: 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."
+"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 ""
 "Vähemalt ühte lõikepuhvris olevat elementi pole võimalik asetada, sest "
 "samanimeline element on juba olemas. Kõik teised elemendid asetati."
@@ -267,18 +228,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Faili %1 avamine kirjutamiseks ei õnnestunud. Palun kontrolli, kas kataloog on "
-"olemas ja kas sul on sellesse kirjutamise õigus."
+"Faili %1 avamine kirjutamiseks ei õnnestunud. Palun kontrolli, kas kataloog "
+"on olemas ja kas sul on sellesse kirjutamise õigus."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Faili avamine ei õnnestunud"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kataloogi loomine ei õnnestunud:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Kataloogi loomine ei õnnestunud:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -292,1353 +251,1515 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Kataloogi loomine ei õnnestunud"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Oleku nime sisestamine"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Üldseadistused"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Sisesta uue oleku nimi:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Pakett on nimeruum"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Sisesta tegevus"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuaalsed destruktorid"
 
-#: 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 "Sisesta uue tegevuse nimi:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Genereeritakse tühjad konstruktorid"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "uus tegevus"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Genereeritakse juurdepääsumeetodid"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML mudel"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operatsioonid on põimitud (inline)"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Loogiline vaade"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Juurdepääsumeetodid on põimitud (inline)"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Kasutusklassivaade"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Juurdepääsumeetodid on avalikud"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentvaade"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Imporditakse fail: %1 Edenemine: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Evitusvaade"
+#: 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 "Valmis."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Olem-seos mudel"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Kas skoop %1 on nimeruum või klass?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Andmetüübid"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ import ootab sinu abi"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Dokumenti on muudetud.\n"
-"Kas sa soovid seda salvestada?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Nimeruum"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Faili %1 pole olemas."
+#: 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 "Klass"
 
-#: 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 "Tõrge laadimisel"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Sisemine viga"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Faili %1 pasitab olevat vigane."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Süntaksiviga enne '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Tihendatud failis %1 ei leitud XMI faili."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Parsimisviga enne '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Lahtipakitud faili laadimisel tekkis tõrge: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Faili laadimisel tekkis tõrge: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "oodati avaldist"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Faili üleslaadimisel tekkis tõrge: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Deklaratsiooni süntaksi viga"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "kasutusklassiskeem"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "oodati }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klassiskeem"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "oodati nimeruumi"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "järgnevusskeem"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "oodati {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "koostööskeem"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Oodati nimeruumi nime"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "olekuskeem"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Deklareerimiseks on vajalik tüübi täpsusti"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "tegevusskeem"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "oodati deklaratsiooni"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponentskeem"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Oodati konstandi avaldist"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "evitusskeem"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "oodati ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "olem-seos skeem"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "puudub }"
 
-#: 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 "Nimi"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Oodati liikme initsialiseerijat"
 
-#: 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 "Sisesta nimi:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Oodati baasklassi täpsustit"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "See pole sobiv skeemi nimi."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Oodati initsialiseerija osa"
 
-#: 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 "Sobimatu nimi"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Oodati identifikaatorit"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "See nimi on juba kasutusel."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Oodati tüübi ID-d"
 
-#: 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 "Nimi pole unikaalne"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Oodati klassinime"
 
-#: 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 "See pole sobiv nimi."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "oodati tingimust"
 
-#: 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 "See nimi on juba kasutusel."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "oodati lauset"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Sisestatud nimi pole unikaalne.\n"
-"Kas sa tõesti seda soovidki?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "oodati initsialiseerimist"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nimi pole unikaalne"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "oodati püünist"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Kasuta nime"
+#: 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 "&Omadused"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Sisesta uus nimi"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Algtegevus"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Kas sa tõesti soovid kustutada skeemi %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Lõpptegevus"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Skeemi kustutamine"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Branch/Merge"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Dokumendi seadistamine..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Fork/Join"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Objektide viidete lahendamine..."
+#: 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 "Üldine"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML-i elementide laadimine..."
+#: 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 "Üldseadistused"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Skeemide laadimine..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tegevuse tüüp:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Tegevuse nimi:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Dokumentatsioon"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Eksternaliseeri kataloog"
+#: 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 "Font:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Sisesta skeemi nimi"
+#: 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 "Fondi seadistused"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Sisesta uue skeemi nimi:"
+#: 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 "Värv"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vaated"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Vidinate värvid"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Sisestatud nimi pole sobiv.\n"
-"Loomisprotsess katkestati."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Tegevused"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Sobimatu nimi"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Uus tegevus..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Sisestatud nimi pole unikaalne!\n"
-"Loomisprotsess katkestati."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Kustuta ankur"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Loomine katkestatud"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Nimeta ümber"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Loendivaate laadimine..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Uus tegevus"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Kaust on vaja enne kustutamist tühjendada."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "uus tegevus"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Kaust pole tühi"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Tegevuse ümbernimetamine"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Sellise nime ja signatuuriga operatsioon on juba olemas. Seda ei saa uuesti "
-"lisada."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Sisesta uue tegevuse nimi:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Tegevuse nime sisestamine"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nimi:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "uus olek"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tüüp:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Üldistus"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Sidemed"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Side iseendale"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Sideme omadused"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Koostööteade"
+#: 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 "Üldseadistused"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Järgnevusteade"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Rollid"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Koostööteade iseendale"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rolli seadistused"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Järgnevusteade iseendale"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Sideme font"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisatsioon"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Rolli A omadused"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Ühesuunaline side"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Rolli B omadused"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Eksport"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Rolli A nähtavus"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Skeem"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Rolli B nähtavus"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Uus"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Rolli A muudetavus"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Näita"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Rolli B muudetavus"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kood"
+msgid "Rolename:"
+msgstr "Rolli nimi:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktiivne &keel"
+msgid "Multiplicity:"
+msgstr "Mitmesus:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentatsioon"
+msgid "Public"
+msgstr "Public"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Kriips-kriips (//)"
+msgid "Private"
+msgstr "Private"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Kriips-tärn /**  */)"
+msgid "Protected"
+msgstr "Protected"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stiil:"
+msgid "Implementation"
+msgstr "Teostus"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ koodi genereerimine</p>"
+msgid "Changeable"
+msgstr "Muudetav"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Üldine"
+msgid "Frozen"
+msgstr "Külmutatud"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Meetodi keha genereerimine"
+msgid "Add only"
+msgstr "Ainult lisatav"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Genereeritud koodis kasutatakse järgnevaid klasse:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Klassi &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Tegija &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Paketi &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Muutuja</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Kasutusklassi &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Liidese &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponendi &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Tehise &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Väärtustiku &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Väärtustik</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Andmetüübi &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Olemi &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globaalne?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotüübi nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Paketi nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klassi nimi"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstraktklass"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Lisa fail</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstraktne kasutusklass"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projekti genereerimine"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Rakendus"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Loo ANT-i ehitusprojekt"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Joonista kui"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Automaatne meetodite genereerimine"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Vaikeväärtus"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Tühjad konstruktorid"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Täidis:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Sideme juurdepääsumeetodid"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Teek"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Atribuudi juurdepääsumeetodid"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabel"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Nähtavus"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Private"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublic"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivate"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Eellasobjektist"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Atribuudi juurdepääsu vaikimisi skoop:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "&Teostus"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Sidemevälja vaikimisi skoop:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klassi nimi:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Eellasrollist"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Eksemplari nimi:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java koodi genereerimine</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Joonista kui tegija"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Räsi (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Mitmene isend"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Algus-lõpp (=algus  =lõpp)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Näita hävitamist"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby koodi genereerimine</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponendi nimi:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Sõlme nimi:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotüübi nimi:"
+
+#: 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 ""
+"Valitud nimi on juba kasutusel.\n"
+"Nime väärtus tühistati."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Nimi pole unikaalne"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atribuudid"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Uus atribuut..."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operatsioonid"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "&Uus operatsioon..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Mallid"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "&Uus mall..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Väärtused"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "&Uus väärtus..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Olemi atribuudid"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "&Uus olemi atribuut..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Kustuta ankur"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Omadused"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Näita"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operatsioo&nid"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Nähtavus"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&peratsiooni signatuur"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&kett"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ribuudid"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereo&tüüp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Atr&ibuudi signatuur"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Joonistatakse ringina"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Kuvamine"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Kuvamise seadistused"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Atribuudi seadistused"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operatsiooni seadistused"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Mallide seadistused"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Väärtuste seadistused"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Olemi atribuutide seadistused"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Sisaldab elemente"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Sisu seadistused"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klassi sidemed"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "uus_klass"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Uus klass"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klassi atribuudid"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klassi operatsioonid"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Koodi genereerimise seadistused"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Keel"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Genereeri"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Kataloogid"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Lõpeta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Kõik genereeritud failid kirjutatakse kataloogi:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kood genereeritud"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Lehitse..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Pole genereeritud"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "L&ehitse..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Pole veel genereeritud"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Kaasatakse päisefailid kataloogist:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Kataloogi %1 ei ole olemas. Kas sa soovid selle nüüd luua?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Koodigeneraatori poolt loodud failid salvestatakse sellesse kataloogi"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Väljundkataloogi ei ole olemas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Loo kataloog"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ära loo"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Selles kataloogis olevaid faile kasutatakse genereeritud koodi päisefailidena"
+"Kataloogi ei õnnestunud luua.\n"
+"Palun kontrolli, et sul on selle ülemkataloogis kirjutamisõigus, või vali "
+"sobiv kataloog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Ülekirjutamise poliitika"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Viga kataloogi loomisel"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Palun vali sobiv kataloog."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Kui koodigeneraatori poolt kasutada soovitud nimega fail on juba olemas, siis:"
+"Väljundkataloog on olemas, kuid ei ole kirjutatav.\n"
+"Palun määra vajalikud õigused või vali mõni muu kataloog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "K&irjutatakse üle"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Viga väljundkataloogi kirjutamisel"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Olemasolevad failid kirjutatakse üle"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "Paistab, et %1 ei ole kataloog. Palun vali sobiv kataloog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Küsitakse"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Palun vali sobiv kataloog"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Kui sama nimega fail on juba olemas, siis küsitakse, mida teha"
+msgid "Code Viewer"
+msgstr "Koodinäitaja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Kasutatakse teist nime"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Seadistusi pole saadaval.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Kui sama nimega fail on kataloogis juba olemas, siis valitakse uus nimi lisade "
-"failinimele järelliite"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Skeemid"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Vormindamine"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Jooned"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Aktiivne skeem"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Joone lõpu stiil:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Kõik skeemid"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Taande tüüp:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Vali skeeme"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Taande suurus:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "Skeemi &tüüp"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Valik"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Kasutusklass"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Koostöö"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Taane puudub"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Järgnevus"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabeldusmärk"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Olek"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Tühik"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponent"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Kommentaaride ohtrus"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Evitus"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Ühtegi skeemi pole valitud."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Vorming, millesse pildid eksporditakse"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Märkuse dokumentatsioon"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Sihtfail on juba olemas"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"&Sektsioonide kommentaarid lisatakse\n"
-"isegi siis, kui need on tühjad"
+"Fail %1 on juba olemas kataloogis %2.\n"
+"\n"
+"Umbrello võib faili üle kirjutada, salvestada sarnase\n"
+"nimega faili või seda faili üldse mitte genereerida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "R&akenda kõigile ülejäänud failidele"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Kirjuta üle"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Genereeri sarnane failinimi"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Ära &genereeri faili"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameetri omadused"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tüüp:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nimi:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Algväärtus:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Saatmise suund"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Kirjutab kommentaarid, et märgistada erinevaid klassi sektsioone (public, "
-"private), isegi siis, kui sektsioonid on tühjad"
+"\"in\" on ainult loetav parameeter, \"out\" on ainult kirjutatav parameeter "
+"ja \"inout\" on nii loetav kui kirjutatav parameeter."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr ""
-"&Dokumentatsiooni kommentaarid lisatakse\n"
-"isegi siis, kui need on tühjad"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Sisaldab elemente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"&Klasside ja meetodite dokumentatsiooni kommentaarid\n"
-"lisatakse isegi siis, kui need on tühjad"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Vali operatsioon"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Keele seadistused"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Järgnevuse number:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Koodi genereerimise abimees"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klassi operatsioon:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Klasside valimine"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Kohandatud operatsioon:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Umbrello häälestus"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Kasutajaliides"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Kasutajaliidese seadistused"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Joone värv:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Vaikimisi värv"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Täidise värv:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "V&aikimisi värv"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Joone laius:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Vaik&elaius"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Kasutatakse täidist"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Tõsta kõik klassid, mille jaoks soovid koodi genereerida, parempoolsesse "
-"nimekirja"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Lisa klass koodi genereerimisse"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Tagasivõtmine lubatud"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Valitud klassid"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Skeemide kuvamine kaartidena"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Eemalda klass koodi genereerimisest"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Kasutatakse uut C++/Java/Ruby generaatorit"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Saadavalolevad klassid"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Kasutatakse kõverjoonelisi sidemejooni"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Koodi genereerimise olek"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automaatsalvestus"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Koodi genereerimise käivitamiseks klõpsa nuppu \"Genereeri\""
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "A&utomaatsalvestus lubatud"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Genereerimise olek"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Automaatsalvestuse intervall (min.):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Koodinäitaja"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Automaatsalvestuse laiend:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Näita peidetud blokke"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Automaatselt salvestatav fail salvestatakse kui ~/autosave.xmi, kui "
+"automaatne salvestamine leiab aset enne faili käsitsi salvestamist.</"
+"p><p>Kui oled faili juba salvestanud, salvestatakse automaatsalvestusel fail "
+"samasse kataloogi sama nimega, lisades sellele sinu määratud laiendi.</"
+"p><p>Kui laiend on samasugune salvestatud faili laiendiga, kirjutatakse "
+"automaatsalvestamisel varem sinu salvestatud fail üle.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">siia komponendi nimi</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Käivitamine"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Näita bloki tüüpe"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Logo näitamine käivitamisel"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Värvid"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Päeva nõuanne"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Font:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Laaditakse viimane projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Paber:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Uut projekti alustatakse:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Valitud:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "ilma skeemita"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML-objektide blokk:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "klassiskeemiga"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Peidetud blokk:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "kasutusklassiskeemiga"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Mittemuudetav tekst:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "järgnevusskeemiga"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Muudetav tekst:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "koostööskeemiga"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Skeemi omadused"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "olekuskeemiga"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nimi:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "tegevusskeemiga"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Suurendus:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "komponentskeemiga"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "evitusskeemiga"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klassi seadistused"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Näidatakse &nähtavust"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Näidatakse atribuute"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Näidatakse operatsioone"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Näidatakse stereot&üüpe"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Näidatakse atribuutide signatuure"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Näidatakse pakette"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Näidatakse operatsioonide signatuure"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "&Võrgustiku näitamine"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Vaikimisi skoop"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Tõmme koordinaatvõrgule"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Atribuudi vaikimisi skoop:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Komponendi suuruse tõmme"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Operatsiooni vaikimisi skoop:"
 
-#. 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."
-msgstr ""
-"Komponendi küljed joondatakse nii, et need vastaks võrgustiku joontele.\n"
-"Kui tõmme koordinaatvõrgule on lubatud, siis joondatakse komponent alati "
-"kõigist külgedest võrgule."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Koodi genereerimine"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Võrgu silma suurus:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Koodi genereerimise seadistused"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Koodinäitaja seadistused"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Algolek"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Joone laius:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Lõppolek"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Eksporditakse kõik vaated"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Oleku tüüp:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "Skeemi&de salvestamise kataloog:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Oleku nimi:"
 
-#. 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"
-msgstr "Piltide salvestamiseks kasutatav baaskataloog"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Vidina värv"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "P&ildi tüüp:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Atribuudi omadused"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Vorming, millesse pildid eksporditakse"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Klassifikaatori &skoop (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Kataloo&gide kasutamine"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Vaadete salvestamiseks luuakse sihtkataloog samasuguse\n"
-"struktuuriga, mida kasutatakse dokumendis"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&ected"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "&Teostus"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Sa sisestasid atribuudile sobimatu nime."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Sobimatu atribuudi nimi"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Vaated on dokumendis salvestatud kataloogidena. Antud valiku kasutamisel "
-"luuakse valitud baaskataloogis vaadete salvestamiseks samasugune struktuur, "
-"mida kasutatakse dokumendis.\n"
-"Baaskataloogis luuakse ainult kataloogid, mida on loonud kasutaja ise "
-"(loogilist vaadet, kasutusklassivaadet jms. ei looda)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Sisestatud nimi on selles operatsioonis juba kasutusel."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Rolli omadused"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Atribuudi nimi pole unikaalne"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rolli nimi:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Olemi atribuudi omadused"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Mitmesus:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Vaikeväärtus:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Rolli muudetavus"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Pikkus/väärtused:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Ainult lisatav"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automaatne suurendus"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Külmutatud"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "&Nulli lubamine"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Muudetav"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atribuudid:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Rolli nähtavus"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indekseerimine"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Teostus"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Puudub"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Tere tulemast kasutama Umbrellot!</p>\n"
-"<p>UML skeemid võimaldavad disainida ja dokumenteerida objektorienteeritud "
-"tarkvara. Hea sissejuhatuse UML-i kasutamisse annab <a href=\"help:/umbrello\">"
-"Umbrello käsiraamat</a>.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primaarne"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Tere tulemast kasutama Umbrello versiooni 1.5. Selle uuteks omadusteks on "
-"sidemeklassid, Ruby koodi genereerimine, väliste kataloogide kasutamise "
-"võimalus, liideste klassideks muutmise võimalus ja veel palju muud.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Kaartidega skeemid ja välised kataloogid on vastastikku välistavad. Kui "
-"vajad väliseid katalooge, tühista üldseadistustes valik &quot;Skeemide kuvamine "
-"kaartidena&quot;.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unikaalne"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Enamiku skeemi elementide suurust pole võimalik muuta, nad muudavad ise oma "
-"suurust vastavalt sisule.\n"
-"Kastide, märkmete ja järgnevusskeemi teadete suurust on võimalik muuta, "
-"klõpsates elemendil ja nihutades punase ristküliku servi.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Sa sisestasid olemi atribuudile sobimatu nime."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Kui soovid lisada skeemile olemasolevat klassi, siis lohista see lihtsalt "
-"puuvaatest skeemile.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Sobimatu olemi atribuudi nimi"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Refaktoriseerimisvahend võimaldab sul liigutada operatsioone\n"
-"klassi ja selle eellas- ning järglasklasside vahel. Refaktoriseerimise "
-"alustamiseks\n"
-"tee klassil paremklõps.</p>\n"
+"Sisestatud olemi atribuudi nimi on selles operatsioonis juba kasutusel."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Järgnevusskeemide objektid võivad omada destruktorit ja olla\n"
-"joonistatud tegijatena. Omaduste muutmiseks ava elemendi omadused.\n"
-"</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Olemi atribuudi nimi pole unikaalne"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Järgnevusskeemi teated võivad toimida konstruktorina. Selleks klõpsa objekti "
-"kastil (mitte aga püstjoonel).</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operatsiooni omadused"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Järgnevusskeemid toetavad teateid iseendale. Autoteate loomiseks klõpsa "
-"samal vertikaaljoonel veel kord.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstraktoperatsioon"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Kui välise faili laadimist ei kuvata nimekirjas mitte midagi, siis proovi "
-"salvestada mudel teise nimega,\n"
-"sulgeda fail ja avada salvestatud fail uuesti. Tavaliselt täidetakse nimekiri "
-"siis korrektselt.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Päring (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Lõikamine ja kopeerimine eksporditakse PNG-pildina ka lõikepuhvrisse ja nii "
-"saab seda asetada KWordi ja teistesse rakendustesse.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parameetrid"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Sidemed ei pea olema sirgjooned. Topeltklõps sidemel loob uue "
-"liigutuspunkti.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "&Uus parameeter..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Umbrello seadistamise dialoogis on võimalik lubada automaatsalvestus.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Sa sisestasid parameetrile sobimatu nime."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Kas tunned puudust mõnest funktsioonist Umbrellos? Anna meilegi teada.\n"
-"Postita oma soov abimenüüs asuva vearaportite saatmise\n"
-"rakenduse abil vigade andmebaasi või saada soov otse arenduslisti.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Sobimatu parameetri nimi"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Valitud elemente on võimalik kustutada vajutades klahvi Del või "
-"Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+msgstr "Sisestatud nimi on selles operatsioonis juba kasutusel."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Kui leidsid Umbrellost vea, siis anna sellest meilegi teada.\n"
-"Vearaporteid on võimalik postitada abimenüüs asuva vearaportite\n"
-"saatmise vahendi abil.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameetri nimi pole unikaalne."
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Vajutades klahvi Escape seatakse valimine aktiivseks tööriistaks.\n"
-"Backspace muudab tööriista eelmiseks tagasi.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Sisestatud nimi on selles operatsioonis juba kasutusel."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Sa sisestasid sobimatu operatsiooni nime."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Sobimatu operatsiooni nimi"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Sellise signatuuriga operatsioon on juba olemas XXXklassis %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Vali erinev nimi või parameetrid."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Rolli omadused"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Malli omadused"
 
-#: tips.txt:103
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Sa sisestasid sobimatu malli nime."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Sobimatu malli nimi"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Kõiki elemente on võimalik valida vajutades Ctrl-A.</p>\n"
+"Sisestatud malli parameetri nimi on selles operatsioonis juba kasutusel."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Malli nimi pole unikaalne"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Klasside kuvamise seadistused"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Skeemi värvid"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Sisestatud nimi pole sobiv."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Sisestatud nimi pole unikaalne."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nimi pole unikaalne"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Joon:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Täidis:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Vaik&eväärtus"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Kasutatakse täidist"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Kõigi vaadete eksport..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Piltide eksportimisel tekkis vigu:"
+
+#: 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 "Faili salvestamisel tekkis tõrge: %1"
 
-#: tips.txt:108
+#: 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 "Tõrge salvestamisel"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello autonoomne koodigeneraator"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Transformeeritav fail"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Kasutatav XSLT-fail"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Uut klassi saab luua ja seadistada kasutades koodimenüü valikut \"Uue klassi "
-"loomise abimees\".</p>\n"
+"(c) 2006: Gael de Chalendar (aka Kleag), (c) 2002-2006: Umbrello autorid"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello autorid"
+
+#: 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 "Nimi"
+
+#: 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 "Sisesta nimi:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Sisesta operatsiooni nimi:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Sisesta uus tekst:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "TÕRGE"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Teksti muutmine"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Faili %1 pole olemas."
+
+#: 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 "Tõrge laadimisel"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Faili %1 avamine ebaõnnestus."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1692,6 +1813,10 @@ msgstr "Uus operatsioon..."
 msgid "Select Operation..."
 msgstr "Vali operatsioon..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Muuda teksti..."
@@ -1743,6 +1868,19 @@ msgstr "Uus"
 msgid "Rename..."
 msgstr "Nimeta ümber..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Tõrge asetamisel"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Joone värv..."
@@ -1771,14 +1909,26 @@ msgstr "Internaliseeri kataloog"
 msgid "Import Classes..."
 msgstr "Impordi klasse..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pakett"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Alamsüsteem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Tehis"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponentskeem..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Sõlm"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Evitusskeem..."
@@ -1787,10 +1937,18 @@ msgstr "Evitusskeem..."
 msgid "Folder"
 msgstr "Kaust"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Olem"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Olem-seos skeem..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Tegija"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Kasutusklassiskeem..."
@@ -1827,6 +1985,18 @@ msgstr "Uus olemi atribuut..."
 msgid "Export as Picture..."
 msgstr "Ekspordi pildina..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Liides"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Andmetüüp"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Väärtustik"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klassiskeem..."
@@ -1847,26 +2017,10 @@ msgstr "Järgnevusskeem..."
 msgid "Collaboration Diagram..."
 msgstr "Koostööskeem..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atribuudid"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operatsioonid"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Ainult avalik"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Nähtavus"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operatsiooni signatuur"
@@ -1879,11 +2033,6 @@ msgstr "Atribuudi signatuur"
 msgid "Stereotype"
 msgstr "Stereotüüp"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Näita"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribuut..."
@@ -1908,14 +2057,6 @@ msgstr "Täidise värv..."
 msgid "Use Fill Color"
 msgstr "Kasutatakse täidise värvi"
 
-#: 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 "Värv"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Tegija..."
@@ -1944,10 +2085,26 @@ msgstr "Väärtustik..."
 msgid "Package..."
 msgstr "Pakett..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Algolek"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Lõppolek"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Olek..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Algtegevus"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Lõpptegevus"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Alamsüsteem..."
@@ -1992,6 +2149,14 @@ msgstr "Kustuta ankur"
 msgid "Change Association Name..."
 msgstr "Muuda sideme nime..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Tühjenda skeem"
@@ -2026,8 +2191,8 @@ msgstr "faili kataloog"
 
 #: 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 ""
 "sihtkataloogis säilitatakse dokumendis vaadete salvestamiseks kasutatav "
 "puustruktuur"
@@ -2036,191 +2201,94 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(c) 2001: Paul Hensgen, (c) 2002-2006: Umbrello autorid"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Sobimatu sidemete kasutamine."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Sideme tõrge"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Faili %1 pole olemas."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Faili %1 avamine ebaõnnestus."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Peeter Russak"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "pezz@tkwcy.ee"
-
-#: 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 "Valmis."
-
-#: 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 ""
-"X-telje liigutamiseks hoia all klahvi Shift või Ctrl. Y-telge liigutamiseks "
-"hoia all klahve Shift ja Ctrl. Hiire parema nupu klõpsuga saab liigutamise "
-"katkestada."
-
-#: 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 ""
-"X-telje liigutamiseks hoia all klahvi Shift või Ctrl. Y-telge liigutamiseks "
-"hoia all klahve Shift ja Ctrl. Hiire parema nupu klõpsuga saab suuruse muutmise "
-"katkestada."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Kas skoop %1 on nimeruum või klass?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ import ootab sinu abi"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Nimeruum"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Imporditakse fail: %1 Edenemine: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Sisemine viga"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Süntaksiviga enne '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Parsimisviga enne '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "uus_tegija"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "oodati avaldist"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "uus_kasutusklass"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Deklaratsiooni süntaksi viga"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "uus_pakett"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "oodati }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "uus_komponent"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "oodati nimeruumi"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "uus_sõlm"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "oodati {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "uus_tehis"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Oodati nimeruumi nime"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "uus_liides"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Deklareerimiseks on vajalik tüübi täpsusti"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "uus_andmetüüp"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "oodati deklaratsiooni"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "uus_väärtustik"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Oodati konstandi avaldist"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "uus_olem"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "oodati ')'"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "uus_kataloog"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "puudub }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "uus_side"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Oodati liikme initsialiseerijat"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "uus_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Oodati baasklassi täpsustit"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Oodati initsialiseerija osa"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Tühi"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Oodati identifikaatorit"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Vigane argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Oodati tüübi ID-d"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tundmatu argumendi tüüp"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Oodati klassinime"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Illegaalne meetodi imi"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "oodati tingimust"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tundmatu tagastamise tüüp"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "oodati lauset"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Määramata viga"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "oodati initsialiseerimist"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "See on seadistatud koodigeneraatori keelele reserveeritud võtmesõna."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "oodati püünist"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserveeritud võtmesõna"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2234,103 +2302,66 @@ msgstr "Sisesta objekti nimi:"
 msgid "new_parameter"
 msgstr "uus_parameeter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Üldseadistused"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Pakett on nimeruum"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuaalsed destruktorid"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Genereeritakse tühjad konstruktorid"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Genereeritakse juurdepääsumeetodid"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operatsioonid on põimitud (inline)"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Juurdepääsumeetodid on põimitud (inline)"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Juurdepääsumeetodid on avalikud"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Skeem: %2 lehekülg %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Sisesta skeemi nimi"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Lisa baasklass"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Sisesta uue skeemi nimi:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Lisa päritud klass"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr "Kas sa tõesti soovid kustutada kogu skeemi?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Lisa operatsioon"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Kas kustutada skeem?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Lisa atribuut"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Ümbernimetamine katkestatud"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Lisa baasliides"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Loendi tüübi %1 elemendi ümbernimetamine pole veel realiseeritud."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Lisa päritud liides"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funktsioon pole realiseeritud"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Baasklassifikaatorid"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Sisestatud nimi pole sobiv.\n"
-"Ümbernimetusprotsess katkestati."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Päritud klassifikaatorid"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "uus_side"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Oleku nime sisestamine"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "uus_atribuut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Sisesta uue oleku nimi:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "uus_mall"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Sisesta tegevus"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "uus_operatsioon"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Sobimatu sidemete kasutamine."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "uus_väärtus"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Sideme tõrge"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "uus_väli"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "uus olek"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2484,11 +2515,6 @@ msgstr "&Ekspordi pildina..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "E&kspordi kõik skeemid piltidena..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Omadused"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Suurendusnäidik"
@@ -2573,14 +2599,21 @@ msgstr "&Dokumentatsioon"
 msgid "Opening file..."
 msgstr "Faili avamine..."
 
+#: 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 "Uue dokumendi loomine..."
 
 #: 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"
@@ -2617,6 +2650,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-tihendusega XMI-fail\n"
 "*|Kõik failid"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2625,6 +2662,10 @@ msgstr ""
 "Fail %1 on juba olemas.\n"
 "Kas sa soovid seda üle kirjutada?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Kirjuta üle"
@@ -2660,8 +2701,8 @@ msgstr "Lõikepuhvri sisu asetamine..."
 
 #: 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 ""
 "Lõikepuhvri sisu asetamine ei õnnestunud. Võib-olla on lõikepuhvris olevad "
 "objektid sobimatut tüüpi."
@@ -2718,1258 +2759,1316 @@ msgstr "Kõik failid"
 msgid "Select Code to Import"
 msgstr "Imporditava koodi valimine"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Klassi &nimi:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Tegija &nimi:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "uus_atribuut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Paketi &nimi:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "uus_mall"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Kasutusklassi &nimi:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "uus_operatsioon"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Liidese &nimi:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "uus_väärtus"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponendi &nimi:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "uus_väli"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Tehise &nimi:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML mudel"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Väärtustiku &nimi:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Loogiline vaade"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Andmetüübi &nimi:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Kasutusklassivaade"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Olemi &nimi:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentvaade"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotüübi nimi:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Evitusvaade"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Paketi nimi:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Olem-seos mudel"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstraktklass"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Andmetüübid"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstraktne kasutusklass"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Dokumenti on muudetud.\n"
+"Kas sa soovid seda salvestada?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Rakendus"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Faili %1 pole olemas."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Joonista kui"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Faili %1 pasitab olevat vigane."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Vaikeväärtus"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Tihendatud failis %1 ei leitud XMI faili."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Teek"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Lahtipakitud faili laadimisel tekkis tõrge: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabel"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Faili laadimisel tekkis tõrge: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublic"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Faili üleslaadimisel tekkis tõrge: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivate"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "kasutusklassiskeem"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klassiskeem"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "&Teostus"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "järgnevusskeem"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klassi nimi:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "koostööskeem"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Eksemplari nimi:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "olekuskeem"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Joonista kui tegija"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "tegevusskeem"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Mitmene isend"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponentskeem"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Näita hävitamist"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "evitusskeem"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponendi nimi:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "olem-seos skeem"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Sõlme nimi:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "See pole sobiv skeemi nimi."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotüübi nimi:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "See nimi on juba kasutusel."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Valitud nimi on juba kasutusel.\n"
-"Nime väärtus tühistati."
+"Sisestatud nimi pole unikaalne.\n"
+"Kas sa tõesti seda soovidki?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Nimi pole unikaalne"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Kasuta nime"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Joon:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Sisesta uus nimi"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Täidis:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Kas sa tõesti soovid kustutada skeemi %1?"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Vaik&eväärtus"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Skeemi kustutamine"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Kasutatakse täidist"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Dokumendi seadistamine..."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Tegevused"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Objektide viidete lahendamine..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Uus tegevus..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML-i elementide laadimine..."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Nimeta ümber"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Skeemide laadimine..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Uus tegevus"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Tegevuse ümbernimetamine"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Eksternaliseeri kataloog"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Sisesta uue tegevuse nimi:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Sisesta skeemi nimi"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Sideme omadused"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Sisesta uue skeemi nimi:"
 
-#: 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 "Üldseadistused"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vaated"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Rollid"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Sisestatud nimi pole sobiv.\n"
+"Loomisprotsess katkestati."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rolli seadistused"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Sobimatu nimi"
 
-#: 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 "Fondi seadistused"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Sisestatud nimi pole unikaalne!\n"
+"Loomisprotsess katkestati."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Sideme font"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Loomine katkestatud"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Malli omadused"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Loendivaate laadimine..."
 
-#: 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 "Üldseadistused"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Kaust on vaja enne kustutamist tühjendada."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tüüp:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Kaust pole tühi"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nimi:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Ümbernimetamine katkestatud"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Sa sisestasid sobimatu malli nime."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Loendi tüübi %1 elemendi ümbernimetamine pole veel realiseeritud."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Sobimatu malli nimi"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funktsioon pole realiseeritud"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Sisestatud malli parameetri nimi on selles operatsioonis juba kasutusel."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Malli nimi pole unikaalne"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Olemi atribuudi omadused"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Vaikeväärtus:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Pikkus/väärtused:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automaatne suurendus"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "&Nulli lubamine"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atribuudid:"
+"Sisestatud nimi pole sobiv.\n"
+"Ümbernimetusprotsess katkestati."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indekseerimine"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Skeem: %2 lehekülg %1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Puudub"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Sisesta skeemi nimi"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primaarne"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Sisesta uue skeemi nimi:"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr "Kas sa tõesti soovid kustutada kogu skeemi?"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unikaalne"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Kas kustutada skeem?"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Sa sisestasid olemi atribuudile sobimatu nime."
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Vaate eksport..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Sobimatu olemi atribuudi nimi"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Pildi eksportimisel tekkis viga:\n"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
-"Sisestatud olemi atribuudi nimi on selles operatsioonis juba kasutusel."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Olemi atribuudi nimi pole unikaalne"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Kuvamine"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Klasside kuvamise seadistused"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Skeemi värvid"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Sisestatud nimi pole sobiv."
-
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Sisestatud nimi pole unikaalne."
+"Valitud fail %1 on juba olemas.\n"
+"Kas sa soovid seda üle kirjutada?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tüüp:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Fail on juba olemas"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello häälestus"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Kataloogi loomine ei õnnestunud: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Kasutajaliides"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Tühja skeemi pole võimalik salvestada"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Kasutajaliidese seadistused"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Skeemi salvestamisel asukohta %1 tekkis probleem"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Joone värv:"
+#: 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 ""
+"X-telje liigutamiseks hoia all klahvi Shift või Ctrl. Y-telge liigutamiseks "
+"hoia all klahve Shift ja Ctrl. Hiire parema nupu klõpsuga saab liigutamise "
+"katkestada."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Vaikimisi värv"
+#: 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 ""
+"X-telje liigutamiseks hoia all klahvi Shift või Ctrl. Y-telge liigutamiseks "
+"hoia all klahve Shift ja Ctrl. Hiire parema nupu klõpsuga saab suuruse "
+"muutmise katkestada."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Täidise värv:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "V&aikimisi värv"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Sünkroonne teade"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Joone laius:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asünkroonne teade"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Vaik&elaius"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Pealdis"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Kasutatakse täidist"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Märkus"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Tagasivõtmine lubatud"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kast"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Skeemide kuvamine kaartidena"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Seos"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Kasutatakse uut C++/Java/Ruby generaatorit"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Suunatud side"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Kasutatakse kõverjoonelisi sidemejooni"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Teostus (üldistus/realisatsioon)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automaatsalvestus"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Süvaajalugu"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "A&utomaatsalvestus lubatud"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Lihtne ajalugu"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Automaatsalvestuse intervall (min.):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Ühendus"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Automaatsalvestuse laiend:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Harunemine"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Automaatselt salvestatav fail salvestatakse kui ~/autosave.xmi, kui "
-"automaatne salvestamine leiab aset enne faili käsitsi salvestamist.</p>"
-"<p>Kui oled faili juba salvestanud, salvestatakse automaatsalvestusel fail "
-"samasse kataloogi sama nimega, lisades sellele sinu määratud laiendi.</p>"
-"<p>Kui laiend on samasugune salvestatud faili laiendiga, kirjutatakse "
-"automaatsalvestamisel varem sinu salvestatud fail üle.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Liidus"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Käivitamine"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Valik"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Logo näitamine käivitamisel"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Tegevuse üleminek"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Päeva nõuanne"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Teade"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Laaditakse viimane projekt"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "DEFINEERIMATA"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Uut projekti alustatakse:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Valik"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "ilma skeemita"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "klassiskeemiga"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "kasutusklassiskeemiga"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "järgnevusskeemiga"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "koostööskeemiga"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Näidatakse operatsioone"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "olekuskeemiga"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "tegevusskeemiga"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Tühjenda skeem"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "komponentskeemiga"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "evitusskeemiga"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Üldistus"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klassi seadistused"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Näidatakse &nähtavust"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Näidatakse atribuute"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Sideme nimi"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Näidatakse operatsioone"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Näidatakse stereot&üüpe"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Näidatakse atribuutide signatuure"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Näidatakse pakette"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Vaikeväärtus"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Vaikimisi skoop"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Atribuudi vaikimisi skoop:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Kriips-kriips (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Operatsiooni vaikimisi skoop:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Kriips-tärn /**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Koodi genereerimine"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stiil:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Koodi genereerimise seadistused"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ koodi genereerimine</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Koodinäitaja seadistused"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Meetodi keha genereerimine"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operatsiooni omadused"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Genereeritud koodis kasutatakse järgnevaid klasse:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstraktoperatsioon"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Klassifikaatori &skoop (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Päring (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Muutuja</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "&Teostus"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parameetrid"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Uus parameeter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Sa sisestasid parameetrile sobimatu nime."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Väärtustik</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Sobimatu parameetri nimi"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr "Sisestatud nimi on selles operatsioonis juba kasutusel."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globaalne?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameetri nimi pole unikaalne."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Sisestatud nimi on selles operatsioonis juba kasutusel."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klassi nimi"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Sa sisestasid sobimatu operatsiooni nime."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Lisa fail</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Sobimatu operatsiooni nimi"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projekti genereerimine"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Sellise signatuuriga operatsioon on juba olemas XXXklassis %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Loo ANT-i ehitusprojekt"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Vali erinev nimi või parameetrid."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Automaatne meetodite genereerimine"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Rolli A omadused"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Tühjad konstruktorid"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Rolli B omadused"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Sideme juurdepääsumeetodid"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Rolli A nähtavus"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Atribuudi juurdepääsumeetodid"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Rolli B nähtavus"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Eellasobjektist"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Rolli A muudetavus"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Atribuudi juurdepääsu vaikimisi skoop:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Rolli B muudetavus"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Sidemevälja vaikimisi skoop:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Sisaldab elemente"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Eellasrollist"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Märkuse dokumentatsioon"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java koodi genereerimine</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Uus atribuut..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Räsi (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "&Uus operatsioon..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Algus-lõpp (=algus  =lõpp)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Mallid"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby koodi genereerimine</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "&Uus mall..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Keel"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Väärtused"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Kataloogid"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "&Uus väärtus..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Kõik genereeritud failid kirjutatakse kataloogi:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Olemi atribuudid"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Lehitse..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "&Uus olemi atribuut..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "L&ehitse..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Algtegevus"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Kaasatakse päisefailid kataloogist:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Lõpptegevus"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Koodigeneraatori poolt loodud failid salvestatakse sellesse kataloogi"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tegevuse tüüp:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Selles kataloogis olevaid faile kasutatakse genereeritud koodi päisefailidena"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Tegevuse nimi:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Ülekirjutamise poliitika"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Vidinate värvid"
+#: 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 ""
+"Kui koodigeneraatori poolt kasutada soovitud nimega fail on juba olemas, "
+"siis:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Atribuudi omadused"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "K&irjutatakse üle"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Algväärtus:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Olemasolevad failid kirjutatakse üle"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Küsitakse"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Sa sisestasid atribuudile sobimatu nime."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Kui sama nimega fail on juba olemas, siis küsitakse, mida teha"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Sobimatu atribuudi nimi"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Kasutatakse teist nime"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Sisestatud nimi on selles operatsioonis juba kasutusel."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Kui sama nimega fail on kataloogis juba olemas, siis valitakse uus nimi "
+"lisade failinimele järelliite"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Atribuudi nimi pole unikaalne"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Vormindamine"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Vali operatsioon"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Jooned"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Järgnevuse number:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Joone lõpu stiil:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klassi operatsioon:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Taande tüüp:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Kohandatud operatsioon:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Taande suurus:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Skeemid"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Aktiivne skeem"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Kõik skeemid"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Taane puudub"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Vali skeeme"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabeldusmärk"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "Skeemi &tüüp"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Tühik"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Valik"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Kommentaaride ohtrus"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Koostöö"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"&Sektsioonide kommentaarid lisatakse\n"
+"isegi siis, kui need on tühjad"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Järgnevus"
+#: 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 ""
+"Kirjutab kommentaarid, et märgistada erinevaid klassi sektsioone (public, "
+"private), isegi siis, kui sektsioonid on tühjad"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Evitus"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr ""
+"&Dokumentatsiooni kommentaarid lisatakse\n"
+"isegi siis, kui need on tühjad"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Ühtegi skeemi pole valitud."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"&Klasside ja meetodite dokumentatsiooni kommentaarid\n"
+"lisatakse isegi siis, kui need on tühjad"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Kuvamise seadistused"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Keele seadistused"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Atribuudi seadistused"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Koodi genereerimise abimees"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operatsiooni seadistused"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Klasside valimine"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Mallide seadistused"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Tõsta kõik klassid, mille jaoks soovid koodi genereerida, parempoolsesse "
+"nimekirja"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Väärtuste seadistused"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Lisa klass koodi genereerimisse"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Olemi atribuutide seadistused"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Valitud klassid"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Sisu seadistused"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Eemalda klass koodi genereerimisest"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Sidemed"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Saadavalolevad klassid"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klassi sidemed"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Koodi genereerimise olek"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operatsioo&nid"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Koodi genereerimise käivitamiseks klõpsa nuppu \"Genereeri\""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Nähtavus"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Genereerimise olek"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&peratsiooni signatuur"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Näita peidetud blokke"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&kett"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">siia komponendi nimi</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ribuudid"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereo&tüüp"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Näita bloki tüüpe"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Atr&ibuudi signatuur"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Värvid"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Joonistatakse ringina"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Font:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Algolek"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Paber:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Lõppolek"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Valitud:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Oleku tüüp:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML-objektide blokk:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Oleku nimi:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Peidetud blokk:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Vidina värv"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Mittemuudetav tekst:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "uus_klass"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Muudetav tekst:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Uus klass"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Skeemi omadused"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klassi atribuudid"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Suurendus:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klassi operatsioonid"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameetri omadused"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "&Võrgustiku näitamine"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Saatmise suund"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Tõmme koordinaatvõrgule"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Komponendi suuruse tõmme"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" on ainult loetav parameeter, \"out\" on ainult kirjutatav parameeter ja "
-"\"inout\" on nii loetav kui kirjutatav parameeter."
+"Komponendi küljed joondatakse nii, et need vastaks võrgustiku joontele.\n"
+"Kui tõmme koordinaatvõrgule on lubatud, siis joondatakse komponent alati "
+"kõigist külgedest võrgule."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Genereeri"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Võrgu silma suurus:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Lõpeta"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kood genereeritud"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Pole genereeritud"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Joone laius:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Pole veel genereeritud"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Eksporditakse kõik vaated"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Kataloogi %1 ei ole olemas. Kas sa soovid selle nüüd luua?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "Skeemi&de salvestamise kataloog:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Väljundkataloogi ei ole olemas"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Piltide salvestamiseks kasutatav baaskataloog"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Loo kataloog"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "P&ildi tüüp:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ära loo"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Kataloo&gide kasutamine"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Kataloogi ei õnnestunud luua.\n"
-"Palun kontrolli, et sul on selle ülemkataloogis kirjutamisõigus, või vali sobiv "
-"kataloog."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Viga kataloogi loomisel"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Palun vali sobiv kataloog."
+"Vaadete salvestamiseks luuakse sihtkataloog samasuguse\n"
+"struktuuriga, mida kasutatakse dokumendis"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Väljundkataloog on olemas, kuid ei ole kirjutatav.\n"
-"Palun määra vajalikud õigused või vali mõni muu kataloog."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Viga väljundkataloogi kirjutamisel"
+"Vaated on dokumendis salvestatud kataloogidena. Antud valiku kasutamisel "
+"luuakse valitud baaskataloogis vaadete salvestamiseks samasugune struktuur, "
+"mida kasutatakse dokumendis.\n"
+"Baaskataloogis luuakse ainult kataloogid, mida on loonud kasutaja ise "
+"(loogilist vaadet, kasutusklassivaadet jms. ei looda)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "Paistab, et %1 ei ole kataloog. Palun vali sobiv kataloog."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Rolli muudetavus"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Palun vali sobiv kataloog"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Rolli nähtavus"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Sihtfail on juba olemas"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Eksport"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Fail %1 on juba olemas kataloogis %2.\n"
-"\n"
-"Umbrello võib faili üle kirjutada, salvestada sarnase\n"
-"nimega faili või seda faili üldse mitte genereerida."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "R&akenda kõigile ülejäänud failidele"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Kirjuta üle"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Genereeri sarnane failinimi"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Ära &genereeri faili"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Seadistusi pole saadaval.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Mitmesus"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Sisesta mitmesus:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Sideme nimi"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Sisesta sideme nimi:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rolli nimi"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Sisesta rolli nimi:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Sisesta operatsiooni nimi:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Sisesta uus tekst:"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "TÕRGE"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Teksti muutmine"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Vasakjoondus"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Paremjoondus"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Skeem"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Ülajoondus"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Uus"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alajoondus"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Näita"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Püstine keskjoondus"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Suurendus:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Rõhtne keskjoondus"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kood"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Püstine keskjaotus"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktiivne &keel"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Rõhtne keskjaotus"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Joonduse kasutamiseks tuleb valida vähemalt kaks objekti, näiteks klassid või "
-"tegijad. Sidemeid joondada ei saa."
+"<p>Tere tulemast kasutama Umbrellot!</p>\n"
+"<p>UML skeemid võimaldavad disainida ja dokumenteerida objektorienteeritud "
+"tarkvara. Hea sissejuhatuse UML-i kasutamisse annab <a href=\"help:/umbrello"
+"\">Umbrello käsiraamat</a>.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "See on seadistatud koodigeneraatori keelele reserveeritud võtmesõna."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reserveeritud võtmesõna"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Vaate eksport..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Tere tulemast kasutama Umbrello versiooni 1.5. Selle uuteks omadusteks on "
+"sidemeklassid, Ruby koodi genereerimine, väliste kataloogide kasutamise "
+"võimalus, liideste klassideks muutmise võimalus ja veel palju muud.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Pildi eksportimisel tekkis viga:\n"
+"<p>Kaartidega skeemid ja välised kataloogid on vastastikku välistavad. Kui "
+"vajad väliseid katalooge, tühista üldseadistustes valik &quot;Skeemide "
+"kuvamine kaartidena&quot;.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Valitud fail %1 on juba olemas.\n"
-"Kas sa soovid seda üle kirjutada?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Fail on juba olemas"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "uus_tegija"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "uus_kasutusklass"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "uus_pakett"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "uus_komponent"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "uus_sõlm"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "uus_tehis"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "uus_liides"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "uus_andmetüüp"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "uus_väärtustik"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "uus_olem"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "uus_kataloog"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "uus_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Tühi"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Vigane argument"
+"<p>Enamiku skeemi elementide suurust pole võimalik muuta, nad muudavad ise "
+"oma suurust vastavalt sisule.\n"
+"Kastide, märkmete ja järgnevusskeemi teadete suurust on võimalik muuta, "
+"klõpsates elemendil ja nihutades punase ristküliku servi.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tundmatu argumendi tüüp"
+#: 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 ""
+"<p>Kui soovid lisada skeemile olemasolevat klassi, siis lohista see lihtsalt "
+"puuvaatest skeemile.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Illegaalne meetodi imi"
+#: 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 ""
+"<p>Refaktoriseerimisvahend võimaldab sul liigutada operatsioone\n"
+"klassi ja selle eellas- ning järglasklasside vahel. Refaktoriseerimise "
+"alustamiseks\n"
+"tee klassil paremklõps.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tundmatu tagastamise tüüp"
+#: 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 ""
+"<p>Järgnevusskeemide objektid võivad omada destruktorit ja olla\n"
+"joonistatud tegijatena. Omaduste muutmiseks ava elemendi omadused.\n"
+"</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Määramata viga"
+#: 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 ""
+"<p>Järgnevusskeemi teated võivad toimida konstruktorina. Selleks klõpsa "
+"objekti kastil (mitte aga püstjoonel).</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Lisa baasklass"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Järgnevusskeemid toetavad teateid iseendale. Autoteate loomiseks klõpsa "
+"samal vertikaaljoonel veel kord.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Lisa päritud klass"
+#: 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 ""
+"<p>Kui välise faili laadimist ei kuvata nimekirjas mitte midagi, siis proovi "
+"salvestada mudel teise nimega,\n"
+"sulgeda fail ja avada salvestatud fail uuesti. Tavaliselt täidetakse "
+"nimekiri siis korrektselt.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Lisa operatsioon"
+#: 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 ""
+"<p>Lõikamine ja kopeerimine eksporditakse PNG-pildina ka lõikepuhvrisse ja "
+"nii saab seda asetada KWordi ja teistesse rakendustesse.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Lisa atribuut"
+#: 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 ""
+"<p>Sidemed ei pea olema sirgjooned. Topeltklõps sidemel loob uue "
+"liigutuspunkti.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Lisa baasliides"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Umbrello seadistamise dialoogis on võimalik lubada automaatsalvestus.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Lisa päritud liides"
+#: 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 ""
+"<p>Kas tunned puudust mõnest funktsioonist Umbrellos? Anna meilegi teada.\n"
+"Postita oma soov abimenüüs asuva vearaportite saatmise\n"
+"rakenduse abil vigade andmebaasi või saada soov otse arenduslisti.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Baasklassifikaatorid"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Valitud elemente on võimalik kustutada vajutades klahvi Del või Backspace."
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Päritud klassifikaatorid"
+#: 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 ""
+"<p>Kui leidsid Umbrellost vea, siis anna sellest meilegi teada.\n"
+"Vearaporteid on võimalik postitada abimenüüs asuva vearaportite\n"
+"saatmise vahendi abil.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Kataloogi loomine ei õnnestunud: %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 ""
+"<p>Vajutades klahvi Escape seatakse valimine aktiivseks tööriistaks.\n"
+"Backspace muudab tööriista eelmiseks tagasi.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Tühja skeemi pole võimalik salvestada"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Kõiki elemente on võimalik valida vajutades Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Skeemi salvestamisel asukohta %1 tekkis probleem"
+#: tips:127
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
+msgstr ""
+"<p>Uut klassi saab luua ja seadistada kasutades koodimenüü valikut \"Uue "
+"klassi loomise abimees\".</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "uus_stereotüüp"
diff --git a/tde-i18n-eu/messages/tdesdk/umbrello.po b/tde-i18n-eu/messages/tdesdk/umbrello.po
index 1fbe9626c1d..4e42ee9bbed 100644
--- a/tde-i18n-eu/messages/tdesdk/umbrello.po
+++ b/tde-i18n-eu/messages/tdesdk/umbrello.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-05-26 09:18+0200\n"
 "Last-Translator: marcos <marcos@euskalgnu.org>\n"
 "Language-Team:  <eu@li.org>\n"
@@ -18,247 +18,205 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML modelatzailearen egileak"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Irekitzeko fitxategia"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML modelatzailearen egileak"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML modelatzailearen egileak"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Ion Gaztañaga"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Esportatzen irudi guztiak..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "igaztanaga@gmail.com"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Errore batzuk gertatu dira irudiak esportatzean:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Sartu aktibitatearen izena"
 
-#: 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 "Errorea %1 fitxategia gordetzean"
+#: 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 "Sartu jarduera berriaren izena:"
 
-#: 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 "Errorea gordetzean"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Lerrokatu ezkerrera"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objektua"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Lerrokatu eskuinera"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Mezu sinkronoa"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Lerrokatu goian"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Mezu asinkronoa"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Lerrokatu behean"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Asoziazioak"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Lerrokatu erdian bertikalki"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Edukitza"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Lerrokatu erdian horizontalki"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ainguratu"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Lerrokatu bertikalki elkar banatuta"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etiketa"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Lerrokatu horizontalki elkar banatuta"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Oharra"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Lerrokatzeko gutxienez 2 objektu hautatu behar dituzu (adib. klase edo "
+"aktoreak). Ezin duzu asoziaziorik lerrokatu."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kaxa"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formateatzea"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktorea"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Mendekotasuna"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Orokorpena"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Eransketa"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Erlazioa"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Norantzadun asoziazioa"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Inplementatzen du (Orokorpena/burutzapena)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Konposaketa"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Erabilera-kasua"
-
-#. 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 "Klasea"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Hasierako egoera"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Amaierako egoera"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Adarketa baldintzatua"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Sinkronizatu"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paketea"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Osagaia"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nodoa"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Mendekotasuna"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Objektu konposatua"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Asoziazioak"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfazea"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Asoziazio automatikoa"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datu-mota"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Lankidetza mezua"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumeraketa"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sekuentzia mezua"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entitatea"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Lankidetza mezu automatikoa"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Historia sakona"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sekuentzia mezu automatikoa"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Historia xumea"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Edukitza"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Elkartu"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Konposaketa"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Banandu"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Burutzapena"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Lotura"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Norantza bakarreko asoziazioa"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Aukera"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ainguratu"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Egoeren arteko transizioa"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Jarduera-transizioa"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Jarduera"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Egoera"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Anizkoitasuna"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Amaierako jarduera"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Sartu anizkoitasuna"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Hasierako jarduera"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Asoziazioaren izena"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mezua"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Sartu asoziazioaren izena:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "DEFINITU GABEA"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Eginkizunaren izena"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Hautatu"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Sartu eginkizunaren izena:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Izen eta sinadura bereko eragiketa bat dagoeneko existitzen da. Ezin duzu "
+"berriro gehitu."
+
+#: 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 "Baliogabako izena da."
+
+#: 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 "Baliogabeko izena"
+
+#: 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 "Izena dagoneko erabilita dago."
+
+#: 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 "Ez da izen bakarra"
 
 #: 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."
+"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 ""
 "Gutxienez arbeleko elementu bat ezin izan da itsatsi izen berdineko elementu "
 "bat existitzen delako. Beste elementu guztiak ongi itsatsi dira."
@@ -272,18 +230,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Ezin da %1 fitxategia idaztko ireki. Ziurtatu karpeta existitzen dela eta han "
-"idazteko baimenak dituzula."
+"Ezin da %1 fitxategia idaztko ireki. Ziurtatu karpeta existitzen dela eta "
+"han idazteko baimenak dituzula."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Ezin da fitxategia ireki"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ezin da karpeta sortu.\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ezin da karpeta sortu.\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -297,1355 +253,1524 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Ezin da karpeta sortu"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Sartu egoeraren izena"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Aukera orokorrak"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Sartu egoera berriaren izena:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paketea izen-leku bat da"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Sartu aktibitatea"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Desegile birtualak"
 
-#: 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 "Sartu jarduera berriaren izena:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Sortu eraikitzaile hutsak"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "jarduera berria"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Sortu atzitzatile-motako metodoak"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML eredua"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Eragiketak tartekatuak (inline) dira"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Ikuspegi logikoa"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Atzitzaileak tartekatuak (inline) dira"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Erabilera-kasuen ikuspegia"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Atzitzaileak publikoak dira"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Osagaien ikuspegia"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "%1 fitxategia inportatzen Aurrerapena: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Hedaketa ikuspegia"
+#: 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 "Prest."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entitate-erlazioen eredua"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "%1 barrutia izen-leku edo klase bat al da?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datu-motak"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ inportazioak zure laguntza behar du"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Uneko fitxategia aldatu da.\n"
-"Gorde nahi al duzu?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Izen-lekua"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "%1 fitxategia ez da existitzen."
+#: 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 "Klasea"
 
-#: 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 "Kargaketa errorea"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Barne-errorea"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "%1 fitxategia hondatuta dago."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Errore sintaxia honen aurretik: '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Ez da XMI fitxategirik aurkitu %1 fitxategi konprimatuan."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Analisi-errorea honen aurretik: '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Errore bat gertatu da erauzitako %1 fitxategia kargatzean"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Errorea %1 fitxategia kargatzean"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "espresioa espero zen"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Errorea %1 fitxategia kargatzean"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Deklarazio sintaxi errorea"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "erabilera-kasuen diagrama"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} espero zen"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klaseen diagrama"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace espero zen"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sekuentzien diagrama"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ espero zen"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "lankidetzen diagrama"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Izen-leku izena espero zen"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "egoeren diagrama"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Deklaraziorako motaren espezifikatzailea behar da"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "jardueren diagrama"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "deklarazio bat espero zen"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "osagai diagrama"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Espresio konstantea espero zen"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "hedaketa ikuspegai"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' espero zen"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "entitate-erlazioen diagrama"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} falta da"
 
-#: 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 "Izena"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Kideen hasieraketa espero zen"
 
-#: 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 "Sartu izena:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Oinarri klasearen espezifikatzailea espero zen"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Diagramaren izena baliogabea da."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Hasieraketa sententzia espero zen"
 
-#: 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 "Baliogabeko izena"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identifikadorea espero zen"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Izen hori darabilen beste diagrama bat dago."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Motaren id-a espero zen"
 
-#: 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 "Ez da izen bakarra"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Klasearen izena espero zen"
 
-#: 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 "Baliogabako izena da."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "baldintza espero zen"
 
-#: 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 "Izena dagoneko erabilita dago."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "sententzia espero zen"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Sartu duzun izena ez da bakarra.\n"
-"Hau da nahi zenuen izena?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for hasieraketa espero zen"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Izena ez da bakarra"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch espero zen"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Erabili izena"
+#: 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 "&Propietateak"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Sartu izen berria"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Abioko jarduera"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Ziur zaude %1 diagrama ezabatu nahi duzula?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Azken jarduera"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Ezabatu diagrama"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Adarketa baldintzatua"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Dokumentua konfiguratzen..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Sinkronizatu"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Objektuen erreferentziak ebazten..."
+#: 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 "Orokorra"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML elementuak kargatzen..."
+#: 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 "Propietate orrokorrak"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Diagramak kargatzen..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Jarduera mota:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "TDE-ren UML diagrama"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Jardueraren izena:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autogorde%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 "Dokumentazioa"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Kanporatu karpeta"
+#: 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 "Letra-tipoa:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Sartu ereduaren izena"
+#: 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 "Letra-tipoen ezarpenak"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Sartu ereduaren izen berria:"
+#: 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 "Kolorea"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Ikuspegiak"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Trepetaren koloreak"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Satu duzun izena baliogabea da.\n"
-"Sorrera prozesua bertan behera utzi da."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Jarduerak"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Izena ez da baliozkoa"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Jarduera berria..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Sartu duzun izena ez da bakarra.\n"
-"Sorrera prozesua bertan behera utzi da."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Ezabatu aingura"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Sorrera bertan behera utzi da."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Berrizendatu"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Zerrenda-ikuspegia kargatzen..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Jarduera berria"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Karpeta hustu behar da ezabatu aurretik."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "jarduera berria"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Karpeta ez dago hutsik"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Berrizendatu jarduera"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Izen eta sinadura bereko eragiketa bat dagoeneko existitzen da. Ezin duzu "
-"berriro gehitu."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Sartu jardueraren izen berria"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Sartu aktibitatearen izena"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Izena:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "egoera berria"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Mota:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Orokorpena"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Asoziazioak"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Asoziazio automatikoa"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Asoziazioaren propietateak"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Lankidetza mezua"
+#: 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 "Ezarpen orokorrak"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sekuentzia mezua"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Eginkizunak"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Lankidetza mezu automatikoa"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Eginkizunen ezarpenak"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sekuentzia mezu automatikoa"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Asoziazioaren letra-tipoak"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Burutzapena"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "A eginkizunaren propietateak"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Norantza bakarreko asoziazioa"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "B eginkizunaren propietateak"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "A eginkizunaren ikusgaitasuna"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagrama"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "B eginkizunaren ikusgaitasuna"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Berria"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "A eginkizunaren aldakortasuna"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Er&akutsi"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "B eginkizunaren aldakortasuna"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kodea"
+msgid "Rolename:"
+msgstr "Eginkizunaren izena:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Lengoaia aktiboa"
+msgid "Multiplicity:"
+msgstr "Anizkortasuna:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentazioa"
+msgid "Public"
+msgstr "Publikoa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Barra-barra (//)"
+msgid "Private"
+msgstr "Pribatua"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Barra-izarra (/**  */)"
+msgid "Protected"
+msgstr "Babestua"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Estiloa:"
+msgid "Implementation"
+msgstr "Inplementazioa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ kode sorrera</p>"
+msgid "Changeable"
+msgstr "Aldakorra"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Orokorra"
+msgid "Frozen"
+msgstr "Ez-aldakorra"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Metodoaren gorputzaren sorrera"
+msgid "Add only"
+msgstr "Gehitu bakarrik"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Erabili ondorengoak sortutako kodeko klaseentzat"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Klasearen ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Aktorearen ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Paketearen ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Aldagaia</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Erabilera-kasuaren ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Interfazearen ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Osagaiaren ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Objektu konposatuaren ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Katea</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Enumeraketaren ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Zerrenda</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datu-motaren ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entitatearen ize&na:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globala?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "E&stereotipoaren izena:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Paketearen izena:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klasearen izena"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Klase a&bstraktua"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Goiburu fitxategia</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Erabilera-kasu a&bstraktua"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Proiektuaren sorrera"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Exekutagarria"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Sortu ANT eraikitze dokumentua"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Marraztu honela:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Auto-sortu metodoak"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Lehenetsia"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Eraikitzaile metodo hutsak"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Betegarria:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Asoziazioen metodo atzitzaileak"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Liburutegia"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Atributuen metodo atzitzaileak"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Taula"
 
-#. 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 "Publikoa"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Ikusgaitasuna"
 
-#. 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 "Pribatua"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublikoa"
 
-#. 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 "Babestua"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&ribatua"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Guraso objektutik"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Babes&tua"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Atributuaren atzitzailearen barruti lehenetsia:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Inple&mentazioa"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Asoziazioaren eremuaren barruti lehenetsia:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klasearen izena:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Guraso eginkizunetik"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instantziaren izena:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java kode sorrera</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Marraztu aktore bezala"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Traol ikurra (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Instantzia anizkoitzak"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Hasiera-Amaiera (=hasiera  =amaiera)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Erakutsi desegitea"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby kode sorrera</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Osagaiaren izena:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nodoaren izena:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Estereotipoaren izena:"
+
+#: 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 ""
+"Hautatu duzun izena\n"
+"dagoeneko erabilita dago.\n"
+"Izena berrezarri da."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Izena ez da bakarra"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributuak"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Atributu berria..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Eragiketak"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Eragiketa berria..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Plantilak"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Plantila b&erria..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enumeraketa literalak"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Enumeraketa literal berria..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entitatearen atributuak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Entitate-atributu berria..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Ezabatu aingura"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Propietateak"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Erakutsi"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "E&ragiketak"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Ikusgaitasuna"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Eragi&keten sinadura"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ketea"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributuak"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Estereot&ipoa"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "At&ributuen sinadura"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Marraztu zirkulu bezala"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Bistaratzea"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Bistaratu aukerak"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Atributuen ezarpenak"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Eragiketen ezarpenak"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Plantilen ezarpenak"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Enumeraketa literalen ezarpenak"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Entitateen atributuen ezarpenak"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Edukitza"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Edukinen ezarpenak"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klaseen asoziazioak"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "klase_berria"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Klase berria"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klasearen atributuak"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klasearen eragiketak"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Kode sorreraren aukerak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Lengoaia"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Sortu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Karpetak"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Amaitu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Idatzi sortutako fitxategi guztiak karteta honetara:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kodea sortu da"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Arakatu..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Kodea ez da sortu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "A&rakatu..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ez da oraindik sortu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "Txertatu goiburu fitxategiak karpeta honetatik:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "%1 karpeta ez da existitzen. Orain sortu nahi al duzu?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Kode sortzaileak sortutako fitxategiak karpeta honetara idatziko dira"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Irteerako karpeta ez da existitzen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Sortu karpeta"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ez sortu"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Karpeta honetako fitxaegiak goiburu fitxategiak bezala erabiliko dira sortutako "
-"kodean"
+"Ezin izan da karpeta sortu.\n"
+"Egiaztatu guraso direktorioan idazteko baimena duzula edo hautatu beste, "
+"baliozko, direktorio bat."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Gainidazketa politika"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Errorea karpeta sortzean"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Hautatu baliozko karpeta."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Izen berdineko eta kode sortzaileak irteera bezala erabili nahi duen fitxategia "
-"dagoeneko existitzen bada:"
+"Irteerako karpeta existitzen da baina ezin da bertan idatzi.\n"
+"Ezarri baimen egokiak edo hautatu beste karpeta bat."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Gainidatzi"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Errorea irteerako karpetan idaztean"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Gainidatzi dauden fitxategiak helburu karpetan badaude"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 ez da baliozko karpeta bat. Hautatu baliozko karpeta bat."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Galdetu"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Hautatu baliozko karpeta bat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Izen berdineko fitxategi bat existitzen bada, galdetu zer egin beharko "
-"litzatekeen"
+msgid "Code Viewer"
+msgstr "Kode ikustailea"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Erabili izen ezberdina"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Ez dago aukerarik eskuragarri.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Fitxategia helburu karpetan dagoeneko existitzen bada, hautatu izen ezberdina "
-"fitxategiaren izenari atzizki bat gehituz"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formateatzea"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Iragazkia"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Lerroak"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Uneko diagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Lerro amaieraren estiloa:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Diagrama &guztiak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Koska mota:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Hautatu diagramak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Koska kopurua:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Diagrama motak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Hautapena"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Erabilera-kasua"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Lankidetza"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Koskarik ez"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekuentzia"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabuladorea"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Egoera"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Espazioa"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Osagaia"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Iruzkinen xehetasun-maila"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Hedaketa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "TDE-ren UML diagrama"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Ez da diagramarik hautatu."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Irudiak esportatuko diren formatua"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Dokumentazio oharra"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Helburu fitxategia dagoeneko existitzen da"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Idatzi iruzkinak atalalentzat, atala hutsik\n"
-"badago ere"
+"%1 fitxategia dagoeneko existitzen da hemen:%2.\n"
+"\n"
+"Umbrello-k fitxategia gainidatzi, antzeko fitxategi izena\n"
+"sortu eta fitxategiaren sorrera bertan behera utz dezake."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Aplikatu gelditzen diren fitxategi guztiei"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Gainidatzi"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Sortu antzeko fitxategi izena"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Ez fitxategia sortu"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parametroen propietateak"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Mota:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Izena:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Hasierako balioa:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Pasatzeko helbidea"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Atal ezberdinak (publikoa, pribatua, etb.) adierazteko iruzkinak idazten ditu "
-"klassetan, atalak hutsik badaude ere"
+"\"in\" irakurtzeko bakarrik den parametro bat da, \"out\" idazteko bakarrik "
+"den parametro bat da eta \"inout\" irakurtzeko eta idazteko den parametro "
+"bat da."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Idatzi dokumentazioaren iruzkinak hutsik badaude ere"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Edukinak"
 
-#. 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/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Hautatu eragiketa"
+
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sekuentzia zenbakia:"
+
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klasearen eragiketa:"
+
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Eragiketa pertsonalizatua:"
+
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Umbrelo-ren konfigurazioa"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Erabiltzailaren interfazea"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Erabiltzailaren interfazearen ezarpenak"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Lerroaren kolorea:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Kolore l&ehenetsia"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Betegarriaren kolorea:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Kolore &lehenetsia"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Lerroaren zabalera:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Zabalera l&ehenetsia:"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Erabili betegarriaren kolorea"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Idatzi iruzkinak  &klase eta metodoen dokumentaziorako, hutsik badaude ere"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Lengoaiaren aukerak"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Gaitu desegitea"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Kode sorrerarako morroia"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Erabili fitxadun diagramak"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Hautatu klaseak"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Erabili C++/Java/Ruby sortzaile berriak"
 
-#. 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"
-msgstr "Kokatu kodea sortu nahi dituzun klase guztiak eskuineko zerrendan"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Erbaili asoziazio lerro angularrak"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Gehitu klasea kode sorrerarako"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Auto-gorde"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Hautatutako klaseak"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Ga&itu auto-gordetzea"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Kendu klasea kode sorreratik"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Hautatu auto-gordetzearen denbora tartea (min):"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Eskuragarri dauden klaseak"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Ezarri auto-gordetzearen atzizkia:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Kode sorreraren egoera"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt> <p>Autogordetako fitxategia ~/autosave.xml fitxategian gordeko da "
+"autogordetzea zuk gorde baino lehen gertatzen bada.</p> <p>Dagoeneko gorde "
+"baduzu, autosave fitxategia zure fitxategiaren karpeta berean gordeko da "
+"izen berearekin, emandako atzizkiarekin.</p> <p>Atzizkia zure fitxategiarena "
+"bada gainidatziko da automatikoki.</p></qt>"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Sakatu Sorrera botoia kode sorrera abiarazteko"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Abioa"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Sorreraren egoera"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Abio&ko logo-a"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kode ikustailea"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Eguneko aholkua"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Erakutsi ezkutuko blokeak"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Kargatu azken proiektua"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">osagaiaren izena hemen</p>"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Abiatu proiektu berria honekin:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Erakutsi bloke mota"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Diagramarik ez"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Koloreak"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klaseen diagramak"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Letra-tipoa:"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Erabilera-kasuen diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papera:"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sekuentzien diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Hautatuta:"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Lankidetzen diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML objektuen blokea:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Egoeren diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Ezkutuko blokea:</p>"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Jardueren diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Testu edita-ezina:</p>"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Osagaien diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Testu editagarria:</p>"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Hedaketa diagrama"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagramaren propietateak"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klaseen ezarpenak"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Izena:"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Erakutsi &ikusgaitasuna"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zoom-a:"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Erakutsi atributuak"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Erakutsi eragiketak"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Erakutsi estereot&ipoak"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Erakutsi atributuen sinadura"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Erakutsi paketeak"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Erakutsi eragiketaren sinadura"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Erakutsi &sareta"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Barrutiaren hasiera"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Atxiki saretar&i"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Atributuaren barruti lehenetsia:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Egokitu osagaiaren tamaina"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Eragiketaren barruti lehenetsia:"
 
-#. 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."
-msgstr ""
-"Egokitu osagaiaren tamaina saretaren espazioaren multiplo batera.\n"
-"'Atxiki saretari' gaituta badago, osagai bat beti egongo da saretarekin "
-"lerrokatuta bere 4 aldetan."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kode sorrera"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Saretaren tartea:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Kode sorreraren ezarpenak"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Kode ikustailearen ezarpenak"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Abioko egoera"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Lerroaren zabalera:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Azken egoera"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Esportatu irudi guztiak"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Egoera mota:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "Diagramak kopiatuko diren &direktorioa:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Egoeraren izena:"
 
-#. 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"
-msgstr "Irudiak gordetzeko erabiliko den oinarri direktorioa"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Trepetaren kolorea"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Irudi mota:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Atributuaren propietateak"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Irudiak esportatuko diren formatua"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Klase estatikoa (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Erabili &karpetak"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Publikoa"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Sortu helburuko direktorioan dokumentuan ikuspegiak gordetzeko\n"
-"erabiltzen ari den egitura"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Bab&estua"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&nplementazioa"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Atributu izen baliogabea sartu duzu."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Atributu izen baliogabea."
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Ikuspegiak dokumentuan karpetetan gordetzen dira. Dokumentuan egindako zuhaitz "
-"egitura bera sor daiteke irudiak gordetzeko erabiliko den hautatutako "
-"direkotorioan aukera honekin.\n"
-"Bakarrik erabiltzaileak egindako karpetak sortzen dira direktorioan (ikuspegi "
-"logikoak, erabilera-kasuen ikuspegia eta abar ez dira sortzen)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Hauratu duzun atributu izena erabilita dago eragiketa honetan."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Eginkizunaren propietateak"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Atributu izena ez da bakarra"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Eginkizunaren izena:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Entitaren atributuaren propietateak"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Anizkortasuna:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Balio &lehenetsia:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Eginkizunaren aldakortasuna"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Luzera/balioak:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Gehitu bakarrik"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto gehikuntza"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Ez-aldakorra"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Onartu &null balioa"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Aldakorra"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributuak:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Eginkizunaren ikusgaitasuna"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexazioa"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Inplementazioa"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Bat ere ez"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Ongi etorri Umbrello-ra.</p>\n"
-"<p>UML diagramek objektuei zuzenduriko software diseinatu eta dokumentatzeko "
-"aukera eskeintzen dute.  <a href=\"help:/umbrello\">Umbrello-ren eskuliburua</a> "
-"UML-ren erabilerarako sarrera egokia da.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Nagusia"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Ongi etorri Umbrello 1.5-era. Bertsio honetan asoziazio klaseak, karpeta "
-"kanporatugarriak, klaseen interfaza aldatzeko ahalmena eta berrikuntza gehiago "
-"daude.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indizea"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Fitxadun diagramak eta karpeta kanporagarriak ezin dira batera erabili. "
-"Karpeta kanporagarriak behar badituzu, desautatu&quot;Erabili fitxadun "
-"diagramak&quot; ezarpen orokorretan.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Bakarra"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p> Diagrama gehienen elementuen tamaina ezin da aldatu, automatikoki aldatuko "
-"dute tamainaz bere edukinetara egokitzeko.\n"
-"Kaxen, oharren eta sekuentzia diagramen mezuen tamaina alda daiteke, eta "
-"honetarako klikatu eta karratu gorria arrastatu besterik ez duzu egin behar.</p>"
-"\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Sartu duzun entitatearen atributuaren izena baliogabea da."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Dagoeneko existitzen den klase bat diagrama batera gehitu nahi baduzu, "
-"arrasta ezazu bere sarrera zuhaitz ikuspegitik.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Entitatearen atributuaren izen baliogabea."
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Umbrello-ren birreraikitze agenteak eragiketak klase eta bere eratorrizko "
-"eta oinarri\n"
-"klaseen artean mugitzeko aukera ematen dizu.\n"
-"Klikatu eskuineko botoiarekin klase bat birreraikitze agentea irekitzeko.</p>\n"
+"Hautatu duzun entitatearen atributuaren izena dagoeneko erabilita dago "
+"eragiketa honetan."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Sekuentzia diagramen objektuek desegile kaxa bat izan dezakete eta aktore "
-"bezala marraztu daitezke.\n"
-"Egin klik bikoitza objektu batean propietateen elkarrizketa-koadroa "
-"irekitzeko..</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Entitatearen atributuaren izena ez da bakarra"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sekuientzia diagramen mezuek eraikitzaile bezala joka dezakete. Klikatu "
-"objektuaren kaxan (lerro bertikalaren ordez) eraikitzaile bihurtzeko.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Eragiketen propietateak"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sekuentzia diagramek auto-mezuak onartzen dituzte. Klikatu lerro bertikal "
-"berdinean berriro automezu bat sortzeko.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Eragiketa &abstraktua"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Kanpoko fitxategi bat kargatzean zerrenda ikuspegian ezer ez bada erakusten, "
-"saiatu eredua izen ezberdinarekin gordetzen, \n"
-"ixten, eta gordetako fitxategia birkargatzen. Normalean zerrenda ikuspegia ongi "
-"eguneratuko da.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Galdetu (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Moztu eta kopiatu-k irudia KWord eta beste aplikazioetan itsatsi daitekeen\n"
-"PNG formatuan ere esportatuko du.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametroak"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Asoziazioek ez dira lerro zuzenak izan behar, batean klik bikoitza egitean "
-"puntu mugikor bat sortuko da.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Parametro &berria..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Auto-gordetzeko aukera Konfiguratu Umbrello elkarrizketa-koadroan gaitu "
-"dezakezu.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Parametro izen baliogabea sartu duzu."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Behar duzun eginbideren bat falta al da Umbrello-n? Jakinarazi iezaguzu. \n"
-"Gehitu ezazu akatsen datu-basera Laguntza menuko Jakinari programa-errorea "
-"aukerarekin\n"
-"edo bidali ezazu uml-devel posta zerrendara.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parametro izen baliogabea"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Hautatutako objektu guztiak ezaba ditzakezu Ezabatu edo Atzera sakatuz.</p>\n"
+"Sartu duzun parametro izena\n"
+"dagoeneko erabilita dago erabiketa honetan."
 
-#: tips.txt:91
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parametro izena ez da bakarra"
+
+#: dialogs/umloperationdialog.cpp:406
 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"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Akatsen bat aurkitu baduzu Umbrello-n, jakinarazi iezaguzu.\n"
-"Akatsek bidaltzeko Laguntza menuko Jakinarazi programa-errorea tresna erabil "
-"dezakezu.</p>\n"
+"Sartu duzun parametro izena dagoeneko erabilita dago erabiketa honetan."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Eragiketa izen baliogabea sartu duzu."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Eragiketa izen baliogabea"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Sinadura bereko eragiketa dagoeneko existitzen da hemen: %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Hautatu izen ezberdina edo parametro zerrenda."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Eginkizunaren propietateak"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Klase  plantilaren propietateak"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Plantila izen baliogabea sartu duzu."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Plantila izen baliogabea"
 
-#: tips.txt:97
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Ihes tekla sakatuz uneko tresna hautapen tresnari ezartzen dio.\n"
-"Atzera teklak aurretik erabiltzen zen tresnara aldatuko du.</p>\n"
+"Hautatu duzun plantila parametro izena dagoeneko erabilita dago eragiketa "
+"honetan."
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Plantila izena ez da bakarra"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Klaseen bistaratze aukerak"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagramaren koloreak"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Sartu duzun izena ez da baliozkoa."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Sartu duzun izena ez da bakarra."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Izena ez da bakarra"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Lerroa:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Betegarria:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "L&ehenetsia"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Erabili betegarria"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Esportatzen irudi guztiak..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Errore batzuk gertatu dira irudiak esportatzean:"
+
+#: 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 "Errorea %1 fitxategia gordetzean"
+
+#: 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 "Errorea gordetzean"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML modelatzailearen egileak"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Irekitzeko fitxategia"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>Ctrl-A sakatuz objektu guztiak hauta ditzakezu.</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Klase berri bat sortu eta konfigura dezakezu Kode menuko Klase berria "
-"sortzeko morroia erabiliz.</p>\n"
+"(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML modelatzailearen egileak"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML modelatzailearen egileak"
+
+#: 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 "Izena"
+
+#: 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 "Sartu izena:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Sartu eragiketaren izena:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Sartu testu berria:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERROREA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Aldatu testua"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "%1 karpeta-fitxategia ez da existitzen."
+
+#: 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 "Kargaketa errorea"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "%1 karpeta-fitxategia hondatuta dago."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1699,6 +1824,10 @@ msgstr "Eragiketa berria"
 msgid "Select Operation..."
 msgstr "Hautatu eragiketa..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Aldatu testua..."
@@ -1750,6 +1879,19 @@ msgstr "Berria"
 msgid "Rename..."
 msgstr "Berrizendatu..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Errorea itsastean"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Lerroaren kolorea..."
@@ -1778,14 +1920,26 @@ msgstr "Barneratu karpeta"
 msgid "Import Classes..."
 msgstr "Inportatu klaseak..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paketea"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Azpisistema"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Objektu konposatua"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Osagaien diagrama..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nodoa"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Hedaketa ikuspegia..."
@@ -1794,10 +1948,18 @@ msgstr "Hedaketa ikuspegia..."
 msgid "Folder"
 msgstr "Karpeta"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entitatea"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Entitate-erlazioen diagrama..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktorea"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Erabilera-kasuen diagrama..."
@@ -1834,6 +1996,18 @@ msgstr "Entitatearen atributu berria..."
 msgid "Export as Picture..."
 msgstr "Esportatu irudi bezala..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfazea"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datu-mota"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumeraketa"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klaseen diagrama..."
@@ -1854,26 +2028,10 @@ msgstr "Sekuentzien diagrama..."
 msgid "Collaboration Diagram..."
 msgstr "Lankidetzen diagrama..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributuak"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Eragiketak"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Publikoa bakarrik"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Ikusgaitasuna"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Eragiketaren sinadura"
@@ -1886,11 +2044,6 @@ msgstr "Atributuaren sinadura"
 msgid "Stereotype"
 msgstr "Estereotipoa"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Erakutsi"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atributua..."
@@ -1915,14 +2068,6 @@ msgstr "Betegarriaren kolorea..."
 msgid "Use Fill Color"
 msgstr "Erabili kolore betegarria"
 
-#: 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 "Kolorea"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktorea..."
@@ -1951,10 +2096,26 @@ msgstr "Enumeraketa..."
 msgid "Package..."
 msgstr "Paketea..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Hasierako egoera"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Amaierako egoera"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Egoera..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Hasierako jarduera"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Amaierako jarduera"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Azpisistema..."
@@ -1999,6 +2160,14 @@ msgstr "Ezabatu aingura"
 msgid "Change Association Name..."
 msgstr "Aldatu asoziazioaren izena..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Garbitu diagrama"
@@ -2033,202 +2202,108 @@ msgstr "fitxategiaren direktorioa"
 
 #: 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 ""
-"mantendu ikuspegiak dokumentuan gordetzeko erabiltzen ari den zuhaitz egitura "
-"helburuko direktorioan"
+"mantendu ikuspegiak dokumentuan gordetzeko erabiltzen ari den zuhaitz "
+"egitura helburuko direktorioan"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML modelatzailearen egileak"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Asoziazioen erabilera desegokia."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Asoziazio errorea"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "%1 karpeta-fitxategia ez da existitzen."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "%1 karpeta-fitxategia hondatuta dago."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Ion Gaztañaga"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "igaztanaga@gmail.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 "Prest."
-
-#: 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 ""
-"Mantendu ktrl edo shift zapatuta X ardatzean mugitzeko. Mantendu shift eta ktrl "
-"Y ardatzean mugitzeko. Eskuineko botoian klik egin mugitzea bertan behera "
-"uzteko."
-
-#: 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 ""
-"Mantendu ktrl edo shift zapatuta X ardatzean mugitzeko. Mantendu shift eta ktrl "
-"Y ardatzean mugitzeko. Eskuineko botoian klik egin tamaina aldatzea bertan "
-"behera uzteko."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "%1 barrutia izen-leku edo klase bat al da?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ inportazioak zure laguntza behar du"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Izen-lekua"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "%1 fitxategia inportatzen Aurrerapena: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Barne-errorea"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Errore sintaxia honen aurretik: '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Analisi-errorea honen aurretik: '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "aktore_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "espresioa espero zen"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "erabilpen-kasu_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Deklarazio sintaxi errorea"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "pakete_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} espero zen"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "osagai_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace espero zen"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nodo_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ espero zen"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "objektu_konposatu_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Izen-leku izena espero zen"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "interfaze_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Deklaraziorako motaren espezifikatzailea behar da"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "dato-mota_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "deklarazio bat espero zen"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "enumeraketa_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Espresio konstantea espero zen"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "entitate_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' espero zen"
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "nodo_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} falta da"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "asoziazio_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Kideen hasieraketa espero zen"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "objektu_berria"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Oinarri klasearen espezifikatzailea espero zen"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Hasieraketa sententzia espero zen"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Hutsik"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identifikadorea espero zen"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Gaizki osatutako argumentua"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Motaren id-a espero zen"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Argumentu mota ezezaguna"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Klasearen izena espero zen"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Metodoaren izen ilegala"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "baldintza espero zen"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Itzulkin mota ezezaguna"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "sententzia espero zen"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Zehaztu gabeko errorea"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for hasieraketa espero zen"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Hau konfiguratutako kode-sortzailerako lengoaiarentzat erreserbatutarko hitz-"
+"gako bat."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch espero zen"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Erreserbatutako hitz-gakoa"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2242,106 +2317,66 @@ msgstr "Sartu objektuaren izena:"
 msgid "new_parameter"
 msgstr "parametro_berria"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Aukera orokorrak"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paketea izen-leku bat da"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Desegile birtualak"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Sortu eraikitzaile hutsak"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Sortu atzitzatile-motako metodoak"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Eragiketak tartekatuak (inline) dira"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Atzitzaileak tartekatuak (inline) dira"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Atzitzaileak publikoak dira"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagrama: %2 Orria: %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Sartu diagramaren izena"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Gehitu oinarri klasea"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Sartu diagrama berriaren izena:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Gehitu klase eratorria"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Diagrama osoa ezabatzeko zorian zaude.\n"
-"Ziur al zaude?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Gehitu eragiketa"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Ezabatu diagrama?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Gehitu atributua"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Berrizendapena bertan behera utzi da"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Gehitu oinarrizko interfazea"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"%1 motako zerrenda-ikuspegiaren elementu bat ez da oraindik inplementatu"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Gehitu interfaze eratorria"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funtzioa ez dago inplementatuta"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Oinarri klasearen propietateak"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Sartu duzun izena baliogabea da.\n"
-"Berrizendapen prozesua bertan behera utzi da."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Eratorritako klasearen propietateak"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "asoziazio_berria"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Sartu egoeraren izena"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "atributu_berria"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Sartu egoera berriaren izena:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "plantila_berria"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Sartu aktibitatea"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "eragiketa_berria"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Asoziazioen erabilera desegokia."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "literal_berria"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Asoziazio errorea"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "eremu_berria"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "egoera berria"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2495,11 +2530,6 @@ msgstr "&Esportatu irudi bezala"
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Esportatu diagrama &guztiak irudi bezala..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Propietateak"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Zoom-aren graduatzailea"
@@ -2584,14 +2614,21 @@ msgstr "&Dokumentazioa"
 msgid "Opening file..."
 msgstr "Fitxategia irekitzen..."
 
+#: 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 "Dokumentu berria sortzen..."
 
 #: 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"
@@ -2601,8 +2638,8 @@ msgstr ""
 "*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Konprimatu gabeko XMI fitxategiak (*.xmi)\n"
 "*.xmi.tgz|Gzip bidez konprimatutakoXMI fitxategiak (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 konprimatutako XMI fitxategiak (*.xmi.tar.bz2) *.mdl|Rose "
-"modelu fitxategiak"
+"*.xmi.tar.bz2|Bzip2 konprimatutako XMI fitxategiak (*.xmi.tar.bz2) *.mdl|"
+"Rose modelu fitxategiak"
 
 #: uml.cpp:677
 msgid "Open File"
@@ -2628,6 +2665,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 bidez konprimetatutako XMI fitxategia\n"
 "*|Fitxategi guztiak"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2636,6 +2677,10 @@ msgstr ""
 "%1 fitxategia dagoeneko existitzen da.\n"
 "Gainidatzi nahi al duzu?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Gainidatzi"
@@ -2671,8 +2716,8 @@ msgstr "Arbelaren edukinak txertatzen..."
 
 #: 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 ""
 "Umbrello-k ezin izan ditu arbelaren edukinak itsatsi. Arbeleko objektuen "
 "datu-mota hemen itsasteko desegokia izan daiteke."
@@ -2731,1266 +2776,1323 @@ msgstr "Fitxategi guztiak"
 msgid "Select Code to Import"
 msgstr "Hautatu inportatzeko kodea"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Klasearen ize&na:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Aktorearen ize&na:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "atributu_berria"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Paketearen ize&na:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "plantila_berria"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Erabilera-kasuaren ize&na:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "eragiketa_berria"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Interfazearen ize&na:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "literal_berria"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Osagaiaren ize&na:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "eremu_berria"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Objektu konposatuaren ize&na:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML eredua"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Enumeraketaren ize&na:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Ikuspegi logikoa"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datu-motaren ize&na:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Erabilera-kasuen ikuspegia"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entitatearen ize&na:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Osagaien ikuspegia"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "E&stereotipoaren izena:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Hedaketa ikuspegia"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Paketearen izena:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entitate-erlazioen eredua"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Klase a&bstraktua"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datu-motak"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Erabilera-kasu a&bstraktua"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Uneko fitxategia aldatu da.\n"
+"Gorde nahi al duzu?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Exekutagarria"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "%1 fitxategia ez da existitzen."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Marraztu honela:"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "%1 fitxategia hondatuta dago."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Lehenetsia"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Ez da XMI fitxategirik aurkitu %1 fitxategi konprimatuan."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Liburutegia"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Errore bat gertatu da erauzitako %1 fitxategia kargatzean"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Taula"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Errorea %1 fitxategia kargatzean"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublikoa"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Errorea %1 fitxategia kargatzean"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&ribatua"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "erabilera-kasuen diagrama"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Babes&tua"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klaseen diagrama"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Inple&mentazioa"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sekuentzien diagrama"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klasearen izena:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "lankidetzen diagrama"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instantziaren izena:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "egoeren diagrama"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Marraztu aktore bezala"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "jardueren diagrama"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Instantzia anizkoitzak"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "osagai diagrama"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Erakutsi desegitea"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "hedaketa ikuspegai"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Osagaiaren izena:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "entitate-erlazioen diagrama"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nodoaren izena:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Diagramaren izena baliogabea da."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Estereotipoaren izena:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Izen hori darabilen beste diagrama bat dago."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Hautatu duzun izena\n"
-"dagoeneko erabilita dago.\n"
-"Izena berrezarri da."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Izena ez da bakarra"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Lerroa:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Betegarria:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "L&ehenetsia"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Erabili betegarria"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Jarduerak"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Jarduera berria..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Berrizendatu"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Jarduera berria"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Berrizendatu jarduera"
+"Sartu duzun izena ez da bakarra.\n"
+"Hau da nahi zenuen izena?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Sartu jardueraren izen berria"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Erabili izena"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Asoziazioaren propietateak"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Sartu izen berria"
 
-#: 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 "Ezarpen orokorrak"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Ziur zaude %1 diagrama ezabatu nahi duzula?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Eginkizunak"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Ezabatu diagrama"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Eginkizunen ezarpenak"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Dokumentua konfiguratzen..."
 
-#: 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 "Letra-tipoen ezarpenak"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Objektuen erreferentziak ebazten..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Asoziazioaren letra-tipoak"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML elementuak kargatzen..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Klase  plantilaren propietateak"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Diagramak kargatzen..."
 
-#: 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 "Propietate orrokorrak"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autogorde%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Mota:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Kanporatu karpeta"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Izena:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Sartu ereduaren izena"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Plantila izen baliogabea sartu duzu."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Sartu ereduaren izen berria:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Plantila izen baliogabea"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Ikuspegiak"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"Hautatu duzun plantila parametro izena dagoeneko erabilita dago eragiketa "
-"honetan."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Plantila izena ez da bakarra"
+"Satu duzun izena baliogabea da.\n"
+"Sorrera prozesua bertan behera utzi da."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Entitaren atributuaren propietateak"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Izena ez da baliozkoa"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Balio &lehenetsia:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Sartu duzun izena ez da bakarra.\n"
+"Sorrera prozesua bertan behera utzi da."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Luzera/balioak:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Sorrera bertan behera utzi da."
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto gehikuntza"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Zerrenda-ikuspegia kargatzen..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Onartu &null balioa"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Karpeta hustu behar da ezabatu aurretik."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributuak:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Karpeta ez dago hutsik"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexazioa"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Berrizendapena bertan behera utzi da"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Bat ere ez"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"%1 motako zerrenda-ikuspegiaren elementu bat ez da oraindik inplementatu"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Nagusia"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funtzioa ez dago inplementatuta"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indizea"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Sartu duzun izena baliogabea da.\n"
+"Berrizendapen prozesua bertan behera utzi da."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Bakarra"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagrama: %2 Orria: %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Sartu duzun entitatearen atributuaren izena baliogabea da."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Sartu diagramaren izena"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Entitatearen atributuaren izen baliogabea."
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Sartu diagrama berriaren izena:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Hautatu duzun entitatearen atributuaren izena dagoeneko erabilita dago "
-"eragiketa honetan."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Entitatearen atributuaren izena ez da bakarra"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Bistaratzea"
+"Diagrama osoa ezabatzeko zorian zaude.\n"
+"Ziur al zaude?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Klaseen bistaratze aukerak"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Ezabatu diagrama?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagramaren koloreak"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Esportatzen ikuspegia..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Sartu duzun izena ez da baliozkoa."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Errore bat gertatu da irudia esportatzean.\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Sartu duzun izena ez da bakarra."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Hautatutako %1 fitxategia existitzen da dagoeneko.\n"
+"Gainidatzi nahi al duzu?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Mota:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Fitxategia dagoeneko existitzen da"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrelo-ren konfigurazioa"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Ezin da direktorioa sortu: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Erabiltzailaren interfazea"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ezin da hutsik dagoen diagrama bat gorde"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Erabiltzailaren interfazearen ezarpenak"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Arazo bat sortu da diagrama %1(e)an gordetzean"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Lerroaren kolorea:"
+#: 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 ""
+"Mantendu ktrl edo shift zapatuta X ardatzean mugitzeko. Mantendu shift eta "
+"ktrl Y ardatzean mugitzeko. Eskuineko botoian klik egin mugitzea bertan "
+"behera uzteko."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Kolore l&ehenetsia"
+#: 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 ""
+"Mantendu ktrl edo shift zapatuta X ardatzean mugitzeko. Mantendu shift eta "
+"ktrl Y ardatzean mugitzeko. Eskuineko botoian klik egin tamaina aldatzea "
+"bertan behera uzteko."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Betegarriaren kolorea:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objektua"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Kolore &lehenetsia"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Mezu sinkronoa"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Lerroaren zabalera:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Mezu asinkronoa"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Zabalera l&ehenetsia:"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etiketa"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Erabili betegarriaren kolorea"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Oharra"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Gaitu desegitea"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kaxa"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Erabili fitxadun diagramak"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Erlazioa"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Erabili C++/Java/Ruby sortzaile berriak"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Norantzadun asoziazioa"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Erbaili asoziazio lerro angularrak"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Inplementatzen du (Orokorpena/burutzapena)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Auto-gorde"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Historia sakona"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Ga&itu auto-gordetzea"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Historia xumea"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Hautatu auto-gordetzearen denbora tartea (min):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Elkartu"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Ezarri auto-gordetzearen atzizkia:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Banandu"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt> "
-"<p>Autogordetako fitxategia ~/autosave.xml fitxategian gordeko da autogordetzea "
-"zuk gorde baino lehen gertatzen bada.</p> "
-"<p>Dagoeneko gorde baduzu, autosave fitxategia zure fitxategiaren karpeta "
-"berean gordeko da izen berearekin, emandako atzizkiarekin.</p> "
-"<p>Atzizkia zure fitxategiarena bada gainidatziko da automatikoki.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Lotura"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Abioa"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Aukera"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Abio&ko logo-a"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Jarduera-transizioa"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Eguneko aholkua"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mezua"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Kargatu azken proiektua"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "DEFINITU GABEA"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Abiatu proiektu berria honekin:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Hautatu"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Diagramarik ez"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Klaseen diagramak"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Erabilera-kasuen diagrama"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sekuentzien diagrama"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Lankidetzen diagrama"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Erakutsi eragiketak"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Egoeren diagrama"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Jardueren diagrama"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Garbitu diagrama"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Osagaien diagrama"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Hedaketa diagrama"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Orokorpena"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klaseen ezarpenak"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Erakutsi &ikusgaitasuna"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Erakutsi atributuak"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Asoziazioaren izena"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Erakutsi eragiketak"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Erakutsi estereot&ipoak"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Erakutsi atributuen sinadura"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Erakutsi paketeak"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Lehenetsia"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Barrutiaren hasiera"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Atributuaren barruti lehenetsia:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Barra-barra (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Eragiketaren barruti lehenetsia:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Barra-izarra (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kode sorrera"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Estiloa:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Kode sorreraren ezarpenak"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ kode sorrera</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Kode ikustailearen ezarpenak"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Metodoaren gorputzaren sorrera"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Eragiketen propietateak"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Erabili ondorengoak sortutako kodeko klaseentzat"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Eragiketa &abstraktua"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Klase estatikoa (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Galdetu (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Aldagaia</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Bab&estua"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&nplementazioa"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametroak"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Parametro &berria..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Katea</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Parametro izen baliogabea sartu duzu."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Zerrenda</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parametro izen baliogabea"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Sartu duzun parametro izena\n"
-"dagoeneko erabilita dago erabiketa honetan."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globala?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parametro izena ez da bakarra"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"Sartu duzun parametro izena dagoeneko erabilita dago erabiketa honetan."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klasearen izena"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Eragiketa izen baliogabea sartu duzu."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Goiburu fitxategia</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Eragiketa izen baliogabea"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Proiektuaren sorrera"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Sinadura bereko eragiketa dagoeneko existitzen da hemen: %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Sortu ANT eraikitze dokumentua"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Hautatu izen ezberdina edo parametro zerrenda."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Auto-sortu metodoak"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "A eginkizunaren propietateak"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Eraikitzaile metodo hutsak"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "B eginkizunaren propietateak"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Asoziazioen metodo atzitzaileak"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "A eginkizunaren ikusgaitasuna"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Atributuen metodo atzitzaileak"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "B eginkizunaren ikusgaitasuna"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Guraso objektutik"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "A eginkizunaren aldakortasuna"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Atributuaren atzitzailearen barruti lehenetsia:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "B eginkizunaren aldakortasuna"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Asoziazioaren eremuaren barruti lehenetsia:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Edukinak"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Guraso eginkizunetik"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Dokumentazio oharra"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java kode sorrera</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Atributu berria..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Traol ikurra (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Eragiketa berria..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Hasiera-Amaiera (=hasiera  =amaiera)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Plantilak"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby kode sorrera</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Plantila b&erria..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Lengoaia"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enumeraketa literalak"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Karpetak"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Enumeraketa literal berria..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Idatzi sortutako fitxategi guztiak karteta honetara:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entitatearen atributuak"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Arakatu..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Entitate-atributu berria..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "A&rakatu..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Abioko jarduera"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "Txertatu goiburu fitxategiak karpeta honetatik:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Azken jarduera"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Kode sortzaileak sortutako fitxategiak karpeta honetara idatziko dira"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Jarduera mota:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Karpeta honetako fitxaegiak goiburu fitxategiak bezala erabiliko dira "
+"sortutako kodean"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Jardueraren izena:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Gainidazketa politika"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Trepetaren koloreak"
+#: 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 ""
+"Izen berdineko eta kode sortzaileak irteera bezala erabili nahi duen "
+"fitxategia dagoeneko existitzen bada:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Atributuaren propietateak"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Gainidatzi"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Hasierako balioa:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Gainidatzi dauden fitxategiak helburu karpetan badaude"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Publikoa"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Galdetu"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Atributu izen baliogabea sartu duzu."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Izen berdineko fitxategi bat existitzen bada, galdetu zer egin beharko "
+"litzatekeen"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Atributu izen baliogabea."
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Erabili izen ezberdina"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Hauratu duzun atributu izena erabilita dago eragiketa honetan."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Fitxategia helburu karpetan dagoeneko existitzen bada, hautatu izen "
+"ezberdina fitxategiaren izenari atzizki bat gehituz"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Atributu izena ez da bakarra"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formateatzea"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Hautatu eragiketa"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Lerroak"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sekuentzia zenbakia:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Lerro amaieraren estiloa:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klasearen eragiketa:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Koska mota:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Eragiketa pertsonalizatua:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Koska kopurua:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramak"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Iragazkia"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Uneko diagrama"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Diagrama &guztiak"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Koskarik ez"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Hautatu diagramak"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabuladorea"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Diagrama motak"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Espazioa"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Hautapena"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Iruzkinen xehetasun-maila"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Lankidetza"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Idatzi iruzkinak atalalentzat, atala hutsik\n"
+"badago ere"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekuentzia"
+#: 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 ""
+"Atal ezberdinak (publikoa, pribatua, etb.) adierazteko iruzkinak idazten "
+"ditu klassetan, atalak hutsik badaude ere"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Hedaketa"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Idatzi dokumentazioaren iruzkinak hutsik badaude ere"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Ez da diagramarik hautatu."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Idatzi iruzkinak  &klase eta metodoen dokumentaziorako, hutsik badaude ere"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Bistaratu aukerak"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Lengoaiaren aukerak"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Atributuen ezarpenak"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Kode sorrerarako morroia"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Eragiketen ezarpenak"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Hautatu klaseak"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Plantilen ezarpenak"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr "Kokatu kodea sortu nahi dituzun klase guztiak eskuineko zerrendan"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Enumeraketa literalen ezarpenak"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Gehitu klasea kode sorrerarako"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Entitateen atributuen ezarpenak"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Hautatutako klaseak"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Edukinen ezarpenak"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Kendu klasea kode sorreratik"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Asoziazioak"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Eskuragarri dauden klaseak"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klaseen asoziazioak"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Kode sorreraren egoera"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "E&ragiketak"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Sakatu Sorrera botoia kode sorrera abiarazteko"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Ikusgaitasuna"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Sorreraren egoera"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Eragi&keten sinadura"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Erakutsi ezkutuko blokeak"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ketea"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">osagaiaren izena hemen</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributuak"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Estereot&ipoa"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Erakutsi bloke mota"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "At&ributuen sinadura"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Koloreak"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Marraztu zirkulu bezala"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Letra-tipoa:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Abioko egoera"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papera:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Azken egoera"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Hautatuta:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Egoera mota:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML objektuen blokea:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Egoeraren izena:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Ezkutuko blokea:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Trepetaren kolorea"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Testu edita-ezina:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "klase_berria"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Testu editagarria:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Klase berria"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagramaren propietateak"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klasearen atributuak"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zoom-a:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klasearen eragiketak"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parametroen propietateak"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Erakutsi &sareta"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Pasatzeko helbidea"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Atxiki saretar&i"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Egokitu osagaiaren tamaina"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" irakurtzeko bakarrik den parametro bat da, \"out\" idazteko bakarrik den "
-"parametro bat da eta \"inout\" irakurtzeko eta idazteko den parametro bat da."
+"Egokitu osagaiaren tamaina saretaren espazioaren multiplo batera.\n"
+"'Atxiki saretari' gaituta badago, osagai bat beti egongo da saretarekin "
+"lerrokatuta bere 4 aldetan."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Sortu"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Saretaren tartea:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Amaitu"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kodea sortu da"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Kodea ez da sortu"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Lerroaren zabalera:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ez da oraindik sortu"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Esportatu irudi guztiak"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "%1 karpeta ez da existitzen. Orain sortu nahi al duzu?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "Diagramak kopiatuko diren &direktorioa:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Irteerako karpeta ez da existitzen"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Irudiak gordetzeko erabiliko den oinarri direktorioa"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Sortu karpeta"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Irudi mota:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ez sortu"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Erabili &karpetak"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Ezin izan da karpeta sortu.\n"
-"Egiaztatu guraso direktorioan idazteko baimena duzula edo hautatu beste, "
-"baliozko, direktorio bat."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Errorea karpeta sortzean"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Hautatu baliozko karpeta."
+"Sortu helburuko direktorioan dokumentuan ikuspegiak gordetzeko\n"
+"erabiltzen ari den egitura"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Irteerako karpeta existitzen da baina ezin da bertan idatzi.\n"
-"Ezarri baimen egokiak edo hautatu beste karpeta bat."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Errorea irteerako karpetan idaztean"
+"Ikuspegiak dokumentuan karpetetan gordetzen dira. Dokumentuan egindako "
+"zuhaitz egitura bera sor daiteke irudiak gordetzeko erabiliko den "
+"hautatutako direkotorioan aukera honekin.\n"
+"Bakarrik erabiltzaileak egindako karpetak sortzen dira direktorioan "
+"(ikuspegi logikoak, erabilera-kasuen ikuspegia eta abar ez dira sortzen)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 ez da baliozko karpeta bat. Hautatu baliozko karpeta bat."
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Hautatu baliozko karpeta bat"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Eginkizunaren aldakortasuna"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Helburu fitxategia dagoeneko existitzen da"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Eginkizunaren ikusgaitasuna"
 
-#: 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."
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
-"%1 fitxategia dagoeneko existitzen da hemen:%2.\n"
-"\n"
-"Umbrello-k fitxategia gainidatzi, antzeko fitxategi izena\n"
-"sortu eta fitxategiaren sorrera bertan behera utz dezake."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Aplikatu gelditzen diren fitxategi guztiei"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Gainidatzi"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Sortu antzeko fitxategi izena"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Ez fitxategia sortu"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Ez dago aukerarik eskuragarri.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Anizkoitasuna"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Sartu anizkoitasuna"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Asoziazioaren izena"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Sartu asoziazioaren izena:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Eginkizunaren izena"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Sartu eginkizunaren izena:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Sartu eragiketaren izena:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Sartu testu berria:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERROREA"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Aldatu testua"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Lerrokatu ezkerrera"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Lerrokatu eskuinera"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagrama"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Lerrokatu goian"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Berria"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Lerrokatu behean"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Er&akutsi"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Lerrokatu erdian bertikalki"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zoom-a:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Lerrokatu erdian horizontalki"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kodea"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Lerrokatu bertikalki elkar banatuta"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Lengoaia aktiboa"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Lerrokatu horizontalki elkar banatuta"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Lerrokatzeko gutxienez 2 objektu hautatu behar dituzu (adib. klase edo "
-"aktoreak). Ezin duzu asoziaziorik lerrokatu."
+"<p>Ongi etorri Umbrello-ra.</p>\n"
+"<p>UML diagramek objektuei zuzenduriko software diseinatu eta dokumentatzeko "
+"aukera eskeintzen dute.  <a href=\"help:/umbrello\">Umbrello-ren "
+"eskuliburua</a> UML-ren erabilerarako sarrera egokia da.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Hau konfiguratutako kode-sortzailerako lengoaiarentzat erreserbatutarko "
-"hitz-gako bat."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Erreserbatutako hitz-gakoa"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Esportatzen ikuspegia..."
+"<p>Ongi etorri Umbrello 1.5-era. Bertsio honetan asoziazio klaseak, karpeta "
+"kanporatugarriak, klaseen interfaza aldatzeko ahalmena eta berrikuntza "
+"gehiago daude.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Errore bat gertatu da irudia esportatzean.\n"
+"<p>Fitxadun diagramak eta karpeta kanporagarriak ezin dira batera erabili. "
+"Karpeta kanporagarriak behar badituzu, desautatu&quot;Erabili fitxadun "
+"diagramak&quot; ezarpen orokorretan.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Hautatutako %1 fitxategia existitzen da dagoeneko.\n"
-"Gainidatzi nahi al duzu?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Fitxategia dagoeneko existitzen da"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "aktore_berria"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "erabilpen-kasu_berria"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "pakete_berria"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "osagai_berria"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nodo_berria"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "objektu_konposatu_berria"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "interfaze_berria"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "dato-mota_berria"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "enumeraketa_berria"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "entitate_berria"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "nodo_berria"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "objektu_berria"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Hutsik"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Gaizki osatutako argumentua"
+"<p> Diagrama gehienen elementuen tamaina ezin da aldatu, automatikoki "
+"aldatuko dute tamainaz bere edukinetara egokitzeko.\n"
+"Kaxen, oharren eta sekuentzia diagramen mezuen tamaina alda daiteke, eta "
+"honetarako klikatu eta karratu gorria arrastatu besterik ez duzu egin behar."
+"</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Argumentu mota ezezaguna"
+#: 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 ""
+"<p>Dagoeneko existitzen den klase bat diagrama batera gehitu nahi baduzu, "
+"arrasta ezazu bere sarrera zuhaitz ikuspegitik.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Metodoaren izen ilegala"
+#: 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 ""
+"<p>Umbrello-ren birreraikitze agenteak eragiketak klase eta bere eratorrizko "
+"eta oinarri\n"
+"klaseen artean mugitzeko aukera ematen dizu.\n"
+"Klikatu eskuineko botoiarekin klase bat birreraikitze agentea irekitzeko.</"
+"p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Itzulkin mota ezezaguna"
+#: 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 ""
+"<p>Sekuentzia diagramen objektuek desegile kaxa bat izan dezakete eta aktore "
+"bezala marraztu daitezke.\n"
+"Egin klik bikoitza objektu batean propietateen elkarrizketa-koadroa "
+"irekitzeko..</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Zehaztu gabeko errorea"
+#: 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 ""
+"<p>Sekuientzia diagramen mezuek eraikitzaile bezala joka dezakete. Klikatu "
+"objektuaren kaxan (lerro bertikalaren ordez) eraikitzaile bihurtzeko.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Gehitu oinarri klasea"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Sekuentzia diagramek auto-mezuak onartzen dituzte. Klikatu lerro bertikal "
+"berdinean berriro automezu bat sortzeko.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Gehitu klase eratorria"
+#: 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 ""
+"<p>Kanpoko fitxategi bat kargatzean zerrenda ikuspegian ezer ez bada "
+"erakusten, saiatu eredua izen ezberdinarekin gordetzen, \n"
+"ixten, eta gordetako fitxategia birkargatzen. Normalean zerrenda ikuspegia "
+"ongi eguneratuko da.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Gehitu eragiketa"
+#: 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 ""
+"<p>Moztu eta kopiatu-k irudia KWord eta beste aplikazioetan itsatsi "
+"daitekeen\n"
+"PNG formatuan ere esportatuko du.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Gehitu atributua"
+#: 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 ""
+"<p>Asoziazioek ez dira lerro zuzenak izan behar, batean klik bikoitza "
+"egitean puntu mugikor bat sortuko da.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Gehitu oinarrizko interfazea"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Auto-gordetzeko aukera Konfiguratu Umbrello elkarrizketa-koadroan gaitu "
+"dezakezu.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Gehitu interfaze eratorria"
+#: 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 ""
+"<p>Behar duzun eginbideren bat falta al da Umbrello-n? Jakinarazi "
+"iezaguzu. \n"
+"Gehitu ezazu akatsen datu-basera Laguntza menuko Jakinari programa-errorea "
+"aukerarekin\n"
+"edo bidali ezazu uml-devel posta zerrendara.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Oinarri klasearen propietateak"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Hautatutako objektu guztiak ezaba ditzakezu Ezabatu edo Atzera sakatuz.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Eratorritako klasearen propietateak"
+#: 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 ""
+"<p>Akatsen bat aurkitu baduzu Umbrello-n, jakinarazi iezaguzu.\n"
+"Akatsek bidaltzeko Laguntza menuko Jakinarazi programa-errorea tresna erabil "
+"dezakezu.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Ezin da direktorioa sortu: %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 ""
+"<p>Ihes tekla sakatuz uneko tresna hautapen tresnari ezartzen dio.\n"
+"Atzera teklak aurretik erabiltzen zen tresnara aldatuko du.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Ezin da hutsik dagoen diagrama bat gorde"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Ctrl-A sakatuz objektu guztiak hauta ditzakezu.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Arazo bat sortu da diagrama %1(e)an gordetzean"
+#: tips:127
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
+msgstr ""
+"<p>Klase berri bat sortu eta konfigura dezakezu Kode menuko Klase berria "
+"sortzeko morroia erabiliz.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "estereotipo_berria"
diff --git a/tde-i18n-fa/messages/tdesdk/umbrello.po b/tde-i18n-fa/messages/tdesdk/umbrello.po
index fe4b876a272..86332b07ad2 100644
--- a/tde-i18n-fa/messages/tdesdk/umbrello.po
+++ b/tde-i18n-fa/messages/tdesdk/umbrello.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-01-21 15:40+0330\n"
 "Last-Translator: Nazanin Kazemi <kazemi@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -17,243 +17,204 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "مولد کد خودکار مد‌ساز Umbrello UML"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "پرونده برای تبدیل"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "پروندۀ XSLT مورد استفاده"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "نویسندگان مدل‌ساز UML Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "نازنین کاظمی"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "در حال صادرات همۀ نماها..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kazemi@itland.ir"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "هنگام صادرات تصاویر، چند خطا رخ داد:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "مسئلۀ ذخیرۀ پرونده وجود دارد: %1"
+#: 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/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 "خطای ذخیره کردن"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "تراز چپ"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "شیء"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "تراز راست"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "پیام همگام"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "تراز بالا"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "پیام ناهمگام"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "تراز پایین"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "انجمن"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "تراز میانی عمودی"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "محدود کردن"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "تراز میانی افقی"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "لنگر"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "همتراز کردن توزیع عمودی"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "برچسب"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "همتراز کردن توزیع افقی"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "یادداشت"
+#: 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:253
-msgid "Box"
-msgstr "جعبه"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "قالب‌بندی"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "کنشگر"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "وابستگی"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "تعمیم"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "انبوهش"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "رابطه"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "انجمن جهت‌دار"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "پیاده‌سازیها )تعمیم/تحقق("
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "ترکیب"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "رده"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "وضعیت آغازین"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "وضعیت پایانی"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "انشعاب/ادغام"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "محل انشعاب/پیوستن"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "بسته"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "مؤلفه"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "گره"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "وابستگی"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "مصنوعی"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "انجمن"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "واسط"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "انجمن شخصی"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "نوع داده"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "پیام همکاری"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "شمارشی"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "پیام دنباله"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "هستار"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "پیام شخصی همکاری"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "تاریخچۀ عمیق"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "پیام شخصی دنباله"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "تاریخچۀ کم عمق"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "محدود کردن"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "پیوستن"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "ترکیب"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "محل انشعاب"
+#: association.cpp:95
+msgid "Realization"
+msgstr "تحقق"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "پیوندگاه"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "انجمن یکتا"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "انتخاب"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "لنگر"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "گذار وضعیت"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "گذار فعالیت"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "فعالیت"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "وضعیت"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "تعدد"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "فعالیت پایانی"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "تعدد را وارد کنید:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "فعالیت آغازین"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "نام انجمن"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "پیام"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "نام انجمن را وارد کنید:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "تعریف‌نشده"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "نام نقش"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "برگزیدن"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "نام نقش را وارد کنید:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "این یک نام نامعتبر است."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "نام نامعتبر"
+
+#: 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 "این نام، هم اکنون استفاده می‌شود."
+
+#: 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 "نام یکتا نیست"
 
 #: 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."
+"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 ""
 "حداقل یکی از فقره‌های تخته‌یادداشت چسبانده نشد، زیرا فقره‌ای با همان نام از قبل "
 "وجود دارد. سایر فقره‌ها چسبانده شده‌اند."
@@ -267,18 +228,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"نمی‌توان پروندۀ %1 را برای نوشتن باز کرد. لطفاً، مطمئن شوید که پوشه وجود دارد و "
-"مجوز نوشتن در آن را دارید."
+"نمی‌توان پروندۀ %1 را برای نوشتن باز کرد. لطفاً، مطمئن شوید که پوشه وجود دارد "
+"و مجوز نوشتن در آن را دارید."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "نمی‌توان پرونده را باز کرد"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"نمی‌توان پوشه را ایجاد کرد:\n"
+msgid "Cannot create the folder:\n"
+msgstr "نمی‌توان پوشه را ایجاد کرد:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -292,1349 +251,1516 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "نمی‌توان پوشه را ایجاد کرد"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "وارد کردن نام وضعیت"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "گزینه‌های عمومی"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "وارد کردن نام وضعیت جدید:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "بسته، یک فضای نام است"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "وارد کردن فعالیت"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "ویرانگرهای مجازی"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "نام فعالیت جدید را وارد کنید:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "تولید سازنده‌های خالی"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "فعالیت جدید"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "تولید روشهای دستیاب"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "مدل UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "عملیات، درون‌برنامه‌ای است"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "نمای منطقی"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "دستیابها درون‌برنامه‌ای هستند"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "نمای مورد استفاده"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "دستیاب، عمومی است"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "نمای مؤلفه"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "واردات پرونده: %1 پیشرفت: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "نمای آرایش"
+#: 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 "آماده."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "مدل رابطۀ هستار"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "دامنۀ %1، یک فضای نام یا یک رده است؟"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "انواع داده"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "واردات C++ کمک شما را درخواست می‌کند"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"پروندۀ جاری تغییر کرده است.\n"
-"می‌خواهید آن را ذخیره کنید؟"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "فضای نام"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "پروندۀ %1 وجود ندارد."
+#: 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 "رده"
 
-#: 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 "خطای بار کردن"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "خطای درونی"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "به نظر می‌رسد پروندۀ %1 خراب باشد."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "خطای نحوی قبل از »%1«"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "پروندۀ XMI در پروندۀ فشردۀ %1 وجود ندارد."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "خطای تجزیه قبل از »%1«"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "مسئلۀ بار کردن پروندۀ استخراج‌شده وجود دارد: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "مسئلۀ بار کردن پرونده وجود دارد: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "عبارت مورد انتظار بود"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "مسئلۀ بارگذاری پرونده وجود دارد: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "خطای نحوی اعلان"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "نمودار مورد استفاده"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "{ مورد انتظار بود"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "نمودار رده"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "فضای نام مورد انتظار بود"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "نمودار دنباله"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "} مورد انتظار بود"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "نمودار همکاری"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "نام فضای نام مورد انتظار بود"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "نمودار وضعیت"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "نیاز به مشخص‌کنندۀ نوع برای اعلان کردن"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "نمودار فعالیت"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "یک اعلان مورد انتظار بود"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "نمودار مؤلفه"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "عبارت ثابت مورد انتظار بود"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "نمودار آرایش"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "»(« مورد انتظار بود"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "نمودار رابطۀ هستار"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "نام"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "نام را وارد کنید:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "مشخص‌کنندۀ ردۀ پایه مورد انتظار بود"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "این نام نامعتبری برای نمودار است."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "بند مقداردهندۀ اولیه مورد انتظار بود"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "نام نامعتبر"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "شناسه مورد انتظار بود"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "هم اکنون نمودار از آن نام استفاده می‌کند."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "نام یکتا نیست"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "این یک نام نامعتبر است."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "این نام، هم اکنون استفاده می‌شود."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "حکم مورد انتظار بود"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"نامی که وارد کردید، یکتا نبود.\n"
-"این چیزی است که می‌خواستید؟"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "برای مقداردهی اولیه مورد انتظار بود"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "نام، یکتا نیست"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "گرفتن مورد انتظار بود"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "استفاده از نام"
+#: 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 "&ویژگیها‌"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "وارد کردن نام جدید"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "فعالیت آغازین"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "مطمئنید که می‌خواهید نمودار %1 را حذف کنید؟"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "فعالیت پایانی"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "حذف نمودار"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "انشعاب/ادغام"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "در حال برپایی سند..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "محل انشعاب/پیوستن"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "رفع ارجاعات شیء..."
+#: 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 "عمومی"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "در حال بارگذاری عناصر UML..."
+#: 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 "ویژگیهای عمومی"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "در حال بارگذاری نمودارها..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "نوع فعالیت:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "نمودار kde-uml"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "نام فعالیت:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/ذخیرۀ خودکار%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 "مستندات"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "قلم:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "تنظیمات قلم"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "رنگ"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "نماها"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "رنگهای عنصر"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"نامی که وارد کردید، نامعتبر بود.\n"
-"فرآیند ایجاد لغو شده است."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "فعالیتها"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "نام، معتبر نیست"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "فعالیت جدید..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"نامی که وارد کردید، یکتا نبود!\n"
-"فرآیند ایجاد لغو شده است."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "حذف لنگر"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "لغو ایجاد"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "تغییر نام"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "در حال بارگذاری نمای فهرست..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "فعالیت جدید"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "پوشه باید قبل از اینکه بتواند حذف شود، خالی شود."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "فعالیت جدید"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "پوشه خالی نیست"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "تغییر نام فعالیت"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"عملی با همان نام و امضا از قبل وجود دارد. نمی‌توانید آن را دوباره اضافه کنید."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "نام فعالیت جدید را وارد کنید:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "وارد کردن نام فعالیت"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "نام:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "وضعیت جدید"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "نوع:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "تعمیم"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "انجمنها"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "انجمن شخصی"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "ویژگیهای انجمن"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "تنظیمات عمومی"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "پیام دنباله"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "نقشها"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "پیام شخصی همکاری"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "تنظیمات نقش"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "پیام شخصی دنباله"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "قلم انجمن"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "تحقق"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "ویژگیهای نقش A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "انجمن یکتا"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "ویژگیهای نقش B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&صادر‌ات‌"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "نمایانی نقش A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&نمودار‌"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "نمایانی نقش B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&جدید‌"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "تغییرپذیری نقش A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&نمایش‌"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "تغییرپذیری نقش B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&کد‌"
+msgid "Rolename:"
+msgstr "نام نقش:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&زبان فعال‌"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "مستندات"
+msgid "Public"
+msgstr "عمومی"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "ممیز-ممیز )//("
+msgid "Private"
+msgstr "خصوصی"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "ممیز-ستاره )/**  */("
+msgid "Protected"
+msgstr "حفاظت‌شده"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "سبک:"
+msgid "Implementation"
+msgstr "پیاده‌سازی"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">تولید کد C++</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "عمومی"
+msgid "Frozen"
+msgstr "محکم"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "تولید بدنۀ روش"
+msgid "Add only"
+msgstr "فقط افزودن"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "برای رده‌ها در کد تولیدشده، از موارد زیر استفاده کنید:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&نام رده:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr ""
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&نام کنشگر:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "بردار"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&نام بسته:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>متغیر</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&نام مورد استفاده:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr ""
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&نام واسط:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr ""
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&نام مؤلفه:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "رشته"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&نام مصنوعی:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">رشته</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&نام شمارشی:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">فهرست</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&نام نوع داده:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr ""
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&نام هستار:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>سراسری؟</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "نام &کلیشه‌ای:‌"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "نام &بسته:‌"
+
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "ردۀ &مجرد‌"
+
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "مورد استفادۀ &خصیصه‌"
+
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&اجرایی"
+
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "ترسیم به عنوان"
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&پیش‌فرض‌"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&پر کردن:‌"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&کتابخانه‌"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&جدول‌"
+
+#: 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 "&عمومی‌"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&خصوصی‌"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&حفاظت‌شده‌"
+
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "&پیاده‌سازی‌"
+
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "نام رده:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "نام نمونه:"
+
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "ترسیم به عنوان کنشگر"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "نمونۀ چندگانه"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "نمایش تخریب"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "نام مؤلفه:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "نام گره:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
 msgstr ""
+"نامی که انتخاب کرده‌اید\n"
+"هم اکنون استفاده می‌شود.\n"
+"نام، بازنشانی شده است."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "نام رده"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "نام، یکتا نیست"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">پروندۀ Include</p></i>"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "خصیصه‌ها"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "تولید پروژه"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "خصیصۀ &جدید...‌"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "ایجاد سند ساختن ANT"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "عملیات"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "روشهای تولید خودکار"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "عمل &جدید...‌"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "روشهای سازندۀ خالی"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "قالبها"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "روشهای دستیاب انجمن"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "قالب &جدید...‌"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "روشهای دستیاب خصیصه"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+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 "عمومی"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+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 "خصوصی"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+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 "حفاظت‌شده"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "خصیصۀ هستار &جدید...‌"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "از شیء پدر"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "حذف لنگر"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "دامنۀ دستیاب خصیصۀ پیش‌فرض:"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&ویژگیها‌"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "دامنۀ حوزۀ انجمن پیش‌فرض:"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "نمایش"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "از نقش پدر"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&عملیات‌"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">تولید کد جاوا</p>"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&نمایانی‌"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "درهم )#("
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "امضای &عملیات‌"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "شروع-پایان )=begin  =end("
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&بسته‌"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">تولید کد Ruby</p>"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&خصیصه‌ها‌"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&کلیشه‌"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "امضای &خصیصه‌"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "ترسیم به عنوان دایره"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "نمایش"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "گزینه‌های نمایش"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "تنظیمات خصیصه"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "تنظیمات عمل"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "تنظیمات قالبها"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "تنظیمات نویسه‌های لفظی شمارشی"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "تنظیمات خصیصه‌های هستار"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "محدود کردن"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "تنظیمات محتویات"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "انجمنهای رده"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr ""
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "ردۀ جدید"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "خصیصه‌های رده"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "عملیات رده"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "گزینه‌های تولید کد"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "زبان"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&تولید کردن‌"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "پوشه‌ها"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "تمام شدن"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "نوشتن همۀ پرونده‌های تولید‌شده در پوشه:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "کد تولید شد"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&مرور...‌"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "تولید نشد"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&مرور...‌"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "هنوز تولیدنشده"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "پرونده‌های &Include سرآیند از پوشه:‌"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "پوشۀ %1 وجود ندارد. می‌خواهید اکنون آن را ایجاد کنید؟"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "پرونده‌های تولیدشده توسط مولد کد، در این پوشه نوشته می‌شوند"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "پوشۀ خروجی وجود ندارد"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "ایجاد پوشه"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "ایجاد نشود"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"پرونده‌های درون این پوشه، به عنوان پرونده‌های سرآیند در کد تولیدشده استفاده "
-"می‌شوند."
+"نتوانست پوشه ایجاد کند.\n"
+"لطفاً، مطمئن شوید دارای دستیابی نوشتن در پوشۀ پدرش هستید، یا پوشۀ معتبر دیگری "
+"را برگزینید."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "سیاست جای‌نوشت"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "خطای ایجاد پوشه"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "لطفاً، پوشۀ معتبری را برگزینید."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"اگر پرونده‌ای با همان نام مولد کد بخواهد\n"
-"به عنوان پروندۀ خروجی که از قبل وجود دارد استفاده شود:"
+"پروندۀ خروجی وجود دارد، ولی قابل نوشتن نیست.\n"
+"لطفاً، مجوزهای نوشتن مناسب را تنظیم کنید، یا پروندۀ دیگری را انتخاب نمایید."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&جای‌نوشت شود‌"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "جای‌نوشت پرونده‌های موجود، اگر در پوشۀ مقصد وجود دارند"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "به نطر نمی‌رسد %1 یک پوشه باشد. لطفاً، پوشۀ معتبری را انتخاب کنید."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&سؤال شود‌"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "لطفاً، پوشۀ معتبری انتخاب کنید"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "اگر پرونده‌ای با همان نام از قبل وجود دارد، بپرس چه کار کند"
+msgid "Code Viewer"
+msgstr "مشاهده‌گر کد"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&استفاده از یک نام متفاوت‌"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">گزینه‌ای در دسترس نیست.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&نمودارها‌"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "قالب‌بندی"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "پالایه"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "خطوط"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "نمودار &جاری‌"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "سبک پایان خط:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&همۀ نمودارها‌"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "نوع تورفتگی:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&برگزیدن نمودارها‌"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "مقدار تورفتگی:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&نوع نمودار‌"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"یونیکس )\"\\n\"("
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "گزینش"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"ویندوز )\"\\r\\n\"("
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "مورد استفاده"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "مکینتاش )\"\\r\"("
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "همکاری"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "بدون تورفتگی"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "دنباله"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "جهش"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "وضعیت"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "فاصله"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "مؤلفه"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "درازنویسی توضیح"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "آرایش"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "نمودار kde-uml"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "نموداری برگزیده نشده است."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "قالبی که تصاویر به‌ آن صادر می‌شوند"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "مستندات یاددداشت"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "پروندۀ مقصد از قبل وجود دارد"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"نوشتن توضیحات &برای بخشها، حتی اگر بخش \n"
-"خالی است"
+"پروندۀ %1 از قبل در %2  وجود دارد.\n"
+"\n"
+"Umbrello می‌تواند پرونده را جای‌نویسی کرده، یک نام پروندۀ همانند را تولید "
+"نماید، یا این پرونده را تولید نکند."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&اعمال به همۀ پرونده‌های باقی‌مانده‌"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&جای‌نوشت‌"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&تولید نام پروندۀ همانند‌"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "پرونده تولید &نشود"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "ویژگیهای پارامتر"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&نوع:‌"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&نام:‌"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "مقدار &آغازین:‌"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "جهت گذر"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"نوشتن توضیحات برای شاخص کردن بخشهای متفاوت  )عمومی، خصوصی و غیره( در یک رده، "
-"حتی اگر بخشها خالی باشند"
+"«in» یک پارامتر فقط خواندنی، «out» پارامتر فقط نوشتنی و «inout» پارامتری است "
+"برای خواندن و نوشتن."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&نوشتن توضیحات مستندات حتی در صورت خالی بودن"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr "نوشتن توضیحات &برای رده و مستندات روش، حتی در صورت خالی بودن‌"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "برگزیدن عمل"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "گزینه‌های زبان"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "شمارۀ دنباله:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "جادوگر تولید کد"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "عمل رده:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "برگزیدن رده‌ها"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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:30
+msgid "Umbrello Setup"
+msgstr "برپایی Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "واسط کاربر"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "تنظیمات واسط کاربر"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "رنگ خط:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "رنگ &پیش‌فرض‌"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "رنگ پر:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "رنگ &پیش‌فرض‌"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "عرض خط:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "عرض &پیش‌فرض‌"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&استفاده از رنگ پر"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"همۀ رده‌هایی که می‌خواهید برای آن کد تولید کنید را\n"
-" در فهرست جانبی دست راست جا دهید"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "افزودن رده برای تولید کد"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "فعال‌سازی واگرد"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "رده‌های برگزیده"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "استفاده از نمودارهای جهش‌یافته"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "حذف رده از تولید کد"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "استفاده از مولدهای C++/Java/Ruby جدید"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "رده‌های موجود"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "استفاده از خطوط انجمن گوشه‌دار"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "وضعیت تولید کد"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "ذخیرۀ خودکار"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "فشار دکمۀ تولید، برای آغاز تولید کد"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&فعال‌سازی ذخیرۀ خودکار‌"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "وضعیت تولید"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "برگزیدن فاصلۀ زمانی ذخیرۀ خودکار )دقیقه(:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "مشاهده‌گر کد"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "تنظیم پسوند ذخیرۀ خودکار:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "نمایش بلوکهای مخفی"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>اگر قبل از اینکه پرونده را به صورت دستی ذخیره کرده باشید، ذخیرۀ "
+"خودکار رخ دهد، پروندۀ ذخیرۀ خودکار در ~/autosave.xmi  ذخیره می‌شود.</p><p>اگر "
+"قبلاً آن را ذخیره کرده‌اید، پروندۀ ذخیرۀ خودکار در همان پوشۀ پرونده ذخیره شده "
+"و مشابه نام پرونده، همراه با پسوند مشخص‌شده نام‌گذاری می‌شود. </p><p>اگر پسوند "
+"با پسوند پرونده‌ای که شما ذخیره کرده‌اید برابر باشد، ذخیرۀ خودکار پروندۀ شما "
+"را به طور خودکار جای‌نوشت می‌کند.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">نام مؤلفه در اینجا</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "راه‌اندازی"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "نمایش نوع بلوک"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "آرم &راه‌اندازی‌"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "رنگها"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&نکتۀ روز‌"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "قلم:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&بارگذاری آخرین پروژه‌"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "کاغذ:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "آغاز پروژۀ جدید با:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "برگزیده:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "نموداری وجود ندارد"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">بلوک شیء UML</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "نمودار رده"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">بلوک مخفی:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "نمودار مورد استفاده"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">متن غیرقابل ویرایش:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "نمودار دنباله"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">متن قابل ویرایش:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "نمودار همکاری"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "ویژگیهای نمودار"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "نمودار وضعیت"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "نام:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "نمودار فعالیت"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "بزرگ‌نمایی:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "نمودار مؤلفه"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "٪"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "نمودار آرایش"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "تنظیمات رده"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "نمایش &نمایانی‌"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "نمایش خصیصه‌ها"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "نمایش عملیات"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "نمایش &کلیشه‌ای‌"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "نمایش امضای خصیصه‌ها"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "نمایش بسته"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "نمایش امضای عمل"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "نمایش &توری‌"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "آغاز دامنه"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "پرش &به توری‌"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "دامنۀ خصیصۀ پیش‌فرض:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "اندازۀ مولفۀ پرش "
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+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."
-msgstr ""
-"باید اندازۀ مؤلفۀ پرش، چند برابر فاصله‌گذاری توری باشد.\n"
-"اگر »پرش به توری« فعال باشد، همیشه یک مؤلفه از ۴ طرف توری با توری همتراز "
-"می‌شود."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "تولید کد"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "فاصله‌گذاری توری.  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "تنظیمات تولید کد"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr ""
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "تنظیمات مشاهده‌گر کد"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr ""
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "وضعیت آغازین"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "عرض خط:"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "وضعیت پایانی"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "صادرات همۀ نماها "
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "نوع وضعیت:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&فهرست راهنما برای ذخیرۀ نمودارها در:‌"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+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"
-msgstr "فهرست راهنمای پایۀ مورد استفاده برای ذخیره کردن تصاویر"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "رنگ عنصر"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "نوع &تصویر:‌"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+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"
-msgstr "قالبی که تصاویر به‌ آن صادر می‌شوند"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "دامنۀ &رده‌بندی‌ )»ایستا«("
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "استفاده از &پوشه‌ها‌"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&عمومی‌"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"ایجاد همان ساختار درختی استفاده‌شده در سند برای\n"
-"ذخیره کردن نماها در فهرست راهنمای هدف"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&حفاظت‌شده‌"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "&پیاده‌سازی‌"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "نام خصیصۀ نامعتبری را وارد کرده‌اید."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "نام خصیصۀ نامعتبر"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"نماها در پوشه‌های سند ذخیره می‌شوند. توسط این گزینه همان ساختار درختی "
-"استفاده‌شده در این سند، برای ذخیرۀ نماها، در فهرست راهنمای پایه می‌تواند ایجاد "
-"شود.\n"
-"فقط پوشه‌های ایجادشده توسط کاربر، در فهرست راهنما ایجاد می‌شوند )نمای منطقی، "
-"نمای مورد استفاده و مانند آن ایجاد می‌شوند(."
+"The attribute name you have chosen 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"
-msgstr "ویژگیهای نقش"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute 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:"
-msgstr "نام نقش:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "ویژگیهای خصیصۀ هستار"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "تعدد:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "مقدار &پیش‌فرض:‌"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "تغییرپذیری نقش"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "طول/مقادیر:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "فقط افزودن"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "نمو &خودکار‌"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "محکم"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "اجازۀ &پوچ‌"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "تغییرپذیر"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "خصیصه‌ها:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "نمایانی نقش"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "نمایه‌گذاری"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "پیاده‌سازی"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+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"
-msgstr ""
-"<p>به Umbrello خوش آمدید</p>\n"
-"<p>نمودارهای UML به شما اجازۀ طراحی و سندیت دادن نرم‌افزار جهت‌یافتۀ شیء را "
-"می‌دهد.  <a href=\"help:/umbrello\">کتاب مرجع Umbrello</a> "
-"مقدمۀ خوبی برای استفاده از UML است.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&اصلی‌"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>به Umbrello ۱.۵. خوش آمدید. رده‌های انجمن، تولید کد Ruby، خارجی کردن "
-"پوشه‌ها، توانایی تغییر واسطها به رده‌ها و غیره در این نسخۀ جدید است.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&نمایه‌"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>نمودارهای جهش‌یافته و پوشه‌های خارجی‌شده به طور دستی انحصاری هستند. اگر نیاز "
-"به پوشه‌های خارجی دارید، پس »استفاده از نمودارهای جهش‌یافته« را در تنظیمات "
-"عمومی از گزینش خارج کنید.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&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"
-msgstr ""
-"<p>اکثر فقره‌های نمودار نمی‌توانند تغییر اندازه دهند، خودشان برای تناسب با "
-"محتویاتشان تغییر اندازه می‌دهند.\n"
-"جعبه‌ها، یادداشتها و پیامهای نمودار دنباله می‌توانند تغییر اندازه دهند، فقط با  "
-"فشار دادن و کشیدن دنبالۀ قرمز.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "نام خصیصۀ هستار نامعتبری را وارد کرده‌اید."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>اگر می‌خواهید یک ردۀ موجود را به نموداری اضافه کنید، فقط مدخل آن را از درخت‌ "
-"نما بکشید.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "نام خصیصۀ هستار نامعتبر"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>عامل مجدد Umbrello، به شما اجازۀ حرکت عملیات بین یک رده و رده‌های مشتق و "
-"پایۀ\n"
-" آن را می‌دهد.\n"
-"برای باز کردن عامل مجدد، دکمۀ راست موشی را فشار دهید.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "نام خصیصۀ هستاری که انتخاب کرده‌اید، هم اکنون در این عمل استفاده می‌شود."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>اشیای نمودار دنباله می‌توانند جعبۀ سازنده داشته و به عنوان کنشگر ترسیم شوند. "
-"برای\n"
-" محاورۀ ویژگیها دو بار فشار دهید.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name 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"
-msgstr ""
-"<p>پیامهای نمودار دنباله به عنوان سازنده می‌توانند عمل کنند. برای ایجاد سازنده، "
-"روی جعبۀ شیء )به جای خط عمودی( فشار دهید.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "ویژگیهای عمل"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>نمودارهای دنباله، پیامها را در خودشان پشتیبانی می‌کنند. برای ایجاد یک پیام "
-"خودکار، همان خط عمودی را دوباره فشار دهید. </p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "عمل &مجرد:‌"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>اگر هنگام بارگذاری پروندۀ خارجی، چیزی در نمای فهرست نمایش داده نشود، سعی "
-"کنید مدل را تحت نامی متفاوت ذخیره کرده،\n"
-"پروندۀ ذخیره‌شده را بسته و مجدداً بارگذاری کنید. معمولاً نمای فهرست پس از آن "
-"عمومی می‌شود.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&پرس‌وجو )»ثابت«("
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>برش و رونوشت، تصاویر را نیز به یک تخته یادداشت PNG صادر می‌کند، که بتواند در "
-"KWord\n"
-" و کاربردهای دیگر بچسبد.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "پارامترها"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>انجمنها نباید در خطوط طولانی باشند، دو بار فشار بر روی یکی، نقطۀ متحرکی را "
-"ایجاد می‌کند.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "پارامتر &جدید...‌"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>می‌توانید ذخیرۀ خودکار را در محاورۀ Umbrello پیکربندی کنید.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "نام پارامتر نامعتبری را وارد کرده‌اید."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>آیا فاقد ویژگی مورد نیاز شما در Umbrello است؟ لطفاً، اجازه دهید ما هم "
-"بدانیم.\n"
-"یا توسط گزارش اشکال از گزینگان کمک آن را به دادگان اشکالات اضافه کرده، یا\n"
-"به فهرست نامۀ توسعه‌دهندگان uml بفرستید.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "نام پارامتر نامعتبر"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>می‌توانید همۀ اشیای برگزیده را با فشار حذف یا پس‌بر حذف کنید.</p>\n"
+"نام پارامتری که انتخاب کرده‌اید\n"
+"هم اکنون در این عمل استفاده می‌شود."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>اگر اشکالی را در Umbrello یافته‌اید، لطفاً، اجازه دهید ما هم بدانیم.\n"
-"می‌توانید اشکالات را با ابزار گزارش اشکال در گزینگان کمک، ارائه کنید.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "نام پارامتر، یکتا نیست"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>فشار کلید گریز، ابزار جاری را با ابزار گزینش تنظیم می‌کند.\n"
-"کلید پس‌بر به ابزار مورد استفادۀ قبلی پرش می‌کند.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "نام پارامتری که انتخاب کرده‌اید‌، هم اکنون در این عمل استفاده می‌شود."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "نام عمل نامعتبری را وارد کرده‌اید."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "نام عمل نامعتبر"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "عملی با آن امضا از قبل در %1 وجود دارد.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "نام یا فهرست پارامتر متفاوتی را انتخاب کنید."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "ویژگیهای نقش"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "ویژگیهای قالب"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "نام قالب نامعتبری را وارد کرده‌اید."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "نام قالب نامعتبر"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>همۀ اشیا را با فشار مهار-A می‌توانید برگزینید</p>\n"
+"نام پارامتر قالبی که انتخاب کرده‌اید، هم اکنون در این عمل استفاده می‌شود."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "نام قالب، یکتا نیست"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "گزینه‌های نمایش رده‌ها"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "رنگهای نمودار"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "نامی که وارد کرده‌اید، نامعتبر است."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "نامی که وارد کرده‌اید، یکتا نیست."
 
-#: tips.txt:108
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "نام، یکتا نیست"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&خط:‌"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&پر کردن:‌"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&پیش‌فرض‌"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&استفاده از پر کردن‌"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "در حال صادرات همۀ نماها..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+msgstr "مسئلۀ ذخیرۀ پرونده وجود دارد: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "خطای ذخیره کردن"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "مولد کد خودکار مد‌ساز Umbrello UML"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "پرونده برای تبدیل"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "پروندۀ XSLT مورد استفاده"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>ردۀ جدیدی را با استفاده از جادوگر ردۀ جدید در گزینگان کد، می‌توانید ایجاد و "
-"برپا کنید.</p>\n"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "نویسندگان مدل‌ساز UML Umbrello"
+
+#: 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 "نام"
+
+#: 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 "نام را وارد کنید:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "نام عمل را وارد کنید:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "متن جدید را وارد کنید:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "خطا"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "تغییر متن"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "پروندۀ پوشۀ %1 وجود ندارد."
+
+#: 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 "خطای بار کردن"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "پروندۀ پوشۀ %1 باز نمی‌شود."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1688,6 +1814,10 @@ msgstr "عمل جدید..."
 msgid "Select Operation..."
 msgstr "برگزیدن عمل..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "تغییر متن..."
@@ -1739,6 +1869,19 @@ msgstr "جدید"
 msgid "Rename..."
 msgstr "تغییر نام..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "خطای چسباندن"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "رنگ خط..."
@@ -1767,14 +1910,26 @@ msgstr "درونی کردن پوشه..."
 msgid "Import Classes..."
 msgstr "واردات رده‌ها..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "بسته"
+
 #: 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 "گره"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "نمودار آرایش..."
@@ -1783,10 +1938,18 @@ msgstr "نمودار آرایش..."
 msgid "Folder"
 msgstr "پوشه"
 
+#: 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 "نمودار مورد استفاده..."
@@ -1823,6 +1986,18 @@ msgstr "خصیصۀ هستار جدید..."
 msgid "Export as Picture..."
 msgstr "صادرات به عنوان عکس..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "واسط"
+
+#: 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 "نمودار رده..."
@@ -1843,26 +2018,10 @@ msgstr "نمودار دنباله..."
 msgid "Collaboration Diagram..."
 msgstr "نمودار همکاری..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "خصیصه‌ها"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "عملیات"
-
 #: 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 "امضای عمل"
@@ -1875,11 +2034,6 @@ msgstr "امضای خصیصه"
 msgid "Stereotype"
 msgstr "کلیشه"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "نمایش"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "خصیصه..."
@@ -1904,14 +2058,6 @@ msgstr "رنگ پر..."
 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 "رنگ"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "کنشگر..."
@@ -1940,10 +2086,26 @@ msgstr "شمارشی..."
 msgid "Package..."
 msgstr "بسته..."
 
+#: 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 "وضعیت..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "فعالیت آغازین"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "فعالیت پایانی"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "زیرسیستم..."
@@ -1988,6 +2150,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 "پاک کردن نمودار"
@@ -2022,8 +2192,8 @@ 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 ""
 "حفظ ساختار درختی استفاده‌شده برای ذخیره کردن نماهای سند در فهرست راهنمای هدف"
 
@@ -2031,189 +2201,94 @@ msgstr ""
 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 "پروندۀ پوشۀ %1 وجود ندارد."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "پروندۀ پوشۀ %1 باز نمی‌شود."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "نازنین کاظمی"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kazemi@itland.ir"
-
-#: 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 "آماده."
-
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
+#: model_utils.cpp:244
+msgid "new_actor"
 msgstr ""
-"نگه داشتن کلید تبدیل یا مهار برای حرکت در محور X. نگه داشتن کلیدهای تبدیل و "
-"مهار، برای حرکت در محورY. فشار دکمۀ راست برای لغو حرکت.  "
 
-#: 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."
+#: model_utils.cpp:246
+msgid "new_usecase"
 msgstr ""
-"نگه داشتن کلید تبدیل یا مهار برای حرکت در محور X. نگه داشتن کلیدهای تبدیل و "
-"مهار برای حرکت در محورY. فشار دکمۀ راست برای لغو تغییر اندازه.  "
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "دامنۀ %1، یک فضای نام یا یک رده است؟"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "واردات C++ کمک شما را درخواست می‌کند"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "فضای نام"
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "واردات پرونده: %1 پیشرفت: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "خطای درونی"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "خطای نحوی قبل از »%1«"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "خطای تجزیه قبل از »%1«"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: model_utils.cpp:248
+msgid "new_package"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "عبارت مورد انتظار بود"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "خطای نحوی اعلان"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "{ مورد انتظار بود"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "فضای نام مورد انتظار بود"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "} مورد انتظار بود"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "نام فضای نام مورد انتظار بود"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "نیاز به مشخص‌کنندۀ نوع برای اعلان کردن"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "یک اعلان مورد انتظار بود"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "عبارت ثابت مورد انتظار بود"
+#: 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
+msgid "new_folder"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "فاقد {"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "مقداردهنده‌های اولیۀ عضو مورد انتظار بود"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "مشخص‌کنندۀ ردۀ پایه مورد انتظار بود"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "بند مقداردهندۀ اولیه مورد انتظار بود"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "خالی"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "شناسه مورد انتظار بود"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "نشانوند بد شکل"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "شناسۀ نوع مورد انتظار بود"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "نوع نشانوند ناشناخته"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "نام رده مورد انتظار بود"
+#: 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"
-msgstr "شرط مورد انتظار بود"
+#: 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"
-msgstr "حکم مورد انتظار بود"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "خطای نامشخص"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "برای مقداردهی اولیه مورد انتظار بود"
+#: 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"
-msgstr "گرفتن مورد انتظار بود"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "کلید‌واژۀ ذخیره‌شده"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2227,105 +2302,66 @@ msgstr "نام شیء را وارد کنید:"
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "گزینه‌های عمومی"
-
-#: 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"
-msgstr "نمودار: %2 صفحۀ %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "وارد کردن نام نمودار"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "افزودن ردۀ پایه"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "وارد کردن نام جدید نمودار:"
+#: 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?"
-msgstr ""
-"درصدد حذف کل نمودار هستید.\n"
-"مطمئنید؟"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "افزودن عمل"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "نمودار حذف شود؟"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "افزودن خصیصه"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "لغو تغییر نام"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "افزودن واسط پایه"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "هنوز تغییر نام یک فقره از نوع فهرست‌ نمای %1 پیاده‌سازی نمی‌شود."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "افزودن واسط مشتق‌شده"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "تابع پیاده‌سازی نمی‌شود"
+#: 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."
-msgstr ""
-"نامی که وارد کردید، نامعتبر بود.\n"
-"فرآیند تغییر نام لغو شده است."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "رده‌بندیهای مشتق‌شده"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr ""
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "وارد کردن نام وضعیت"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr ""
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "وارد کردن نام وضعیت جدید:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr ""
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "وارد کردن فعالیت"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr ""
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "استفادۀ نادرست انجمنها."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr ""
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "خطای انجمن"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr ""
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "وضعیت جدید"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2479,11 +2515,6 @@ msgstr "&صادرات به عنوان عکس...‌"
 msgid "Export &All Diagrams as Pictures..."
 msgstr "صادرات &همۀ نمودارها به عنوان عکس...‌"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&ویژگیها‌"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "لغزان &بزرگ‌نمایی"
@@ -2568,21 +2599,28 @@ msgstr "&مستندات‌"
 msgid "Opening file..."
 msgstr "در حال باز کردن پرونده..."
 
+#: 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 "در حال ایجاد سند جدید..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|همۀ پرونده‌های پشتیبانی شده(*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|همۀ پرونده‌های پشتیبانی شده(*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|پرونده‌های XMI فشرده نشده (*.xmi)\n"
 "*.xmi.tgz|پرونده‌های XMI فشردۀ Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|پرونده‌های XMI فشردۀ Bzip2 (*.xmi.tar.bz2)\n"
@@ -2612,6 +2650,10 @@ msgstr ""
 "*.xmi.tar.bz2|پروندۀ XMI فشردۀ Bzip2\n"
 "*|همۀ پرونده‌ها"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2620,6 +2662,10 @@ msgstr ""
 "پروندۀ %1 وجود دارد.\n"
 "می‌خواهید آن را جای‌نوشت کنید؟"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "جای‌نوشت"
@@ -2655,8 +2701,8 @@ msgstr "در حال درج محتویات تخته یادداشت..."
 
 #: 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 ""
 "Umbrello نتوانست محتویات تخته یادداشت را بچسباند. ممکن است اشیای درون تخته "
 "یادداشت از نوع نادرست، اینجا درج شود."
@@ -2713,1258 +2759,1306 @@ msgstr "همۀ پرونده‌ها"
 msgid "Select Code to Import"
 msgstr "برگزیدن کد برای واردات"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&نام رده:‌"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&نام کنشگر:‌"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&نام بسته:‌"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&نام مورد استفاده:‌"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&نام واسط:‌"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&نام مؤلفه:‌"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&نام مصنوعی:‌"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "مدل UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&نام شمارشی:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "نمای منطقی"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&نام نوع داده:‌"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "نمای مورد استفاده"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&نام هستار:‌"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "نمای مؤلفه"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "نام &کلیشه‌ای:‌"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "نمای آرایش"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "نام &بسته:‌"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "مدل رابطۀ هستار"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "ردۀ &مجرد‌"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "انواع داده"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "مورد استفادۀ &خصیصه‌"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"پروندۀ جاری تغییر کرده است.\n"
+"می‌خواهید آن را ذخیره کنید؟"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&اجرایی"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "پروندۀ %1 وجود ندارد."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "ترسیم به عنوان"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "به نظر می‌رسد پروندۀ %1 خراب باشد."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&پیش‌فرض‌"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "پروندۀ XMI در پروندۀ فشردۀ %1 وجود ندارد."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&کتابخانه‌"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "مسئلۀ بار کردن پروندۀ استخراج‌شده وجود دارد: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&جدول‌"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "مسئلۀ بار کردن پرونده وجود دارد: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&عمومی‌"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "مسئلۀ بارگذاری پرونده وجود دارد: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&خصوصی‌"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "نمودار مورد استفاده"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&حفاظت‌شده‌"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "نمودار رده"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "&پیاده‌سازی‌"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "نمودار دنباله"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "نام رده:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "نمودار همکاری"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "نام نمونه:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "نمودار وضعیت"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "ترسیم به عنوان کنشگر"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "نمودار فعالیت"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "نمونۀ چندگانه"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "نمودار مؤلفه"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "نمایش تخریب"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "نمودار آرایش"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "نام مؤلفه:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "نمودار رابطۀ هستار"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "نام گره:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "این نام نامعتبری برای نمودار است."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "نام کلیشه‌ای:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "هم اکنون نمودار از آن نام استفاده می‌کند."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"نامی که انتخاب کرده‌اید\n"
-"هم اکنون استفاده می‌شود.\n"
-"نام، بازنشانی شده است."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "نام، یکتا نیست"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&خط:‌"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&پر کردن:‌"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&پیش‌فرض‌"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&استفاده از پر کردن‌"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "فعالیتها"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "فعالیت جدید..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "تغییر نام"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "فعالیت جدید"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "تغییر نام فعالیت"
+"نامی که وارد کردید، یکتا نبود.\n"
+"این چیزی است که می‌خواستید؟"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "نام فعالیت جدید را وارد کنید:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "استفاده از نام"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "ویژگیهای انجمن"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+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 "تنظیمات عمومی"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "مطمئنید که می‌خواهید نمودار %1 را حذف کنید؟"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "نقشها"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "حذف نمودار"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "تنظیمات نقش"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+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 "تنظیمات قلم"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "رفع ارجاعات شیء..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "قلم انجمن"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "در حال بارگذاری عناصر UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "ویژگیهای قالب"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+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 "ویژگیهای عمومی"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/ذخیرۀ خودکار%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&نوع:‌"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "خارجی کردن پوشه"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&نام:‌"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "وارد کردن نام مدل"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "نام قالب نامعتبری را وارد کرده‌اید."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "نام جدید مدل را وارد کنید:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "نام قالب نامعتبر"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "نماها"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter 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/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "نام قالب، یکتا نیست"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "ویژگیهای خصیصۀ هستار"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "مقدار &پیش‌فرض:‌"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "طول/مقادیر:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "نمو &خودکار‌"
+"نامی که وارد کردید، نامعتبر بود.\n"
+"فرآیند ایجاد لغو شده است."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "اجازۀ &پوچ‌"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "نام، معتبر نیست"
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "خصیصه‌ها:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"نامی که وارد کردید، یکتا نبود!\n"
+"فرآیند ایجاد لغو شده است."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "نمایه‌گذاری"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "لغو ایجاد"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&هیچ‌کدام‌"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "در حال بارگذاری نمای فهرست..."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&اصلی‌"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "پوشه باید قبل از اینکه بتواند حذف شود، خالی شود."
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&نمایه‌"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "پوشه خالی نیست"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&یکتا‌"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "لغو تغییر نام"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "نام خصیصۀ هستار نامعتبری را وارد کرده‌اید."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "هنوز تغییر نام یک فقره از نوع فهرست‌ نمای %1 پیاده‌سازی نمی‌شود."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "نام خصیصۀ هستار نامعتبر"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "تابع پیاده‌سازی نمی‌شود"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistviewitem.cpp:478
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"نام خصیصۀ هستاری که انتخاب کرده‌اید، هم اکنون در این عمل استفاده می‌شود."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "نام خصیصۀ هستار، یکتا نیست"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "نمایش"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "گزینه‌های نمایش رده‌ها"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "رنگهای نمودار"
+"نامی که وارد کردید، نامعتبر بود.\n"
+"فرآیند تغییر نام لغو شده است."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "نامی که وارد کرده‌اید، نامعتبر است."
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "نمودار: %2 صفحۀ %1"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "نامی که وارد کرده‌اید، یکتا نیست."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "وارد کردن نام نمودار"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "نوع:"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "وارد کردن نام جدید نمودار:"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "برپایی Umbrello"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"درصدد حذف کل نمودار هستید.\n"
+"مطمئنید؟"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "واسط کاربر"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "نمودار حذف شود؟"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "تنظیمات واسط کاربر"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "در حال صادرات نما..."
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "رنگ خط:"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "هنگام صادرات تصویر، خطایی رخ داد:\n"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "رنگ &پیش‌فرض‌"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"پروندۀ برگزیدۀ %1 وجود دارد.\n"
+"می‌خواهید آن را جای‌نوشت کنید؟"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "رنگ پر:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "پرونده از قبل وجود دارد"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "رنگ &پیش‌فرض‌"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "نمی‌توان فهرست راهنما را ایجاد کرد: %1"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "عرض خط:"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "نمی‌توان نموداری خالی را ذخیره کرد"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "عرض &پیش‌فرض‌"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "هنگام ذخیرۀ نمودار در %1، مسئله‌ای رخ داد"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&استفاده از رنگ پر"
+#: 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 ""
+"نگه داشتن کلید تبدیل یا مهار برای حرکت در محور X. نگه داشتن کلیدهای تبدیل و "
+"مهار، برای حرکت در محورY. فشار دکمۀ راست برای لغو حرکت.  "
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-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 ""
+"نگه داشتن کلید تبدیل یا مهار برای حرکت در محور X. نگه داشتن کلیدهای تبدیل و "
+"مهار برای حرکت در محورY. فشار دکمۀ راست برای لغو تغییر اندازه.  "
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "استفاده از نمودارهای جهش‌یافته"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "شیء"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "استفاده از مولدهای C++/Java/Ruby جدید"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "پیام همگام"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "استفاده از خطوط انجمن گوشه‌دار"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "پیام ناهمگام"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "ذخیرۀ خودکار"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "برچسب"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&فعال‌سازی ذخیرۀ خودکار‌"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "یادداشت"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "برگزیدن فاصلۀ زمانی ذخیرۀ خودکار )دقیقه(:"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "جعبه"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "تنظیم پسوند ذخیرۀ خودکار:"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "رابطه"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>اگر قبل از اینکه پرونده را به صورت دستی ذخیره کرده باشید، ذخیرۀ خودکار رخ "
-"دهد، پروندۀ ذخیرۀ خودکار در ~/autosave.xmi  ذخیره می‌شود.</p>"
-"<p>اگر قبلاً آن را ذخیره کرده‌اید، پروندۀ ذخیرۀ خودکار در همان پوشۀ پرونده "
-"ذخیره شده و مشابه نام پرونده، همراه با پسوند مشخص‌شده نام‌گذاری می‌شود. </p>"
-"<p>اگر پسوند با پسوند پرونده‌ای که شما ذخیره کرده‌اید برابر باشد، ذخیرۀ خودکار "
-"پروندۀ شما را به طور خودکار جای‌نوشت می‌کند.</p></qt>"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "انجمن جهت‌دار"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "راه‌اندازی"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "پیاده‌سازیها )تعمیم/تحقق("
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "آرم &راه‌اندازی‌"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "تاریخچۀ عمیق"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&نکتۀ روز‌"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "تاریخچۀ کم عمق"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&بارگذاری آخرین پروژه‌"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "پیوستن"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "آغاز پروژۀ جدید با:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "محل انشعاب"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "نموداری وجود ندارد"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "پیوندگاه"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "نمودار رده"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "انتخاب"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "نمودار مورد استفاده"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "گذار فعالیت"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "نمودار دنباله"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "پیام"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "نمودار همکاری"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "تعریف‌نشده"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "نمودار وضعیت"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "برگزیدن"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "نمودار فعالیت"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "نمودار مؤلفه"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "نمودار آرایش"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "تنظیمات رده"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "نمایش &نمایانی‌"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "نمایش عملیات"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "نمایش خصیصه‌ها"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "نمایش عملیات"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "پاک کردن نمودار"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "نمایش &کلیشه‌ای‌"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "نمایش امضای خصیصه‌ها"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "تعمیم"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "نمایش بسته"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "آغاز دامنه"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "دامنۀ خصیصۀ پیش‌فرض:"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "نام انجمن"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "دامنۀ عمل پیش‌فرض:"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "تولید کد"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "تنظیمات تولید کد"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "تنظیمات مشاهده‌گر کد"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&پیش‌فرض‌"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "ویژگیهای عمل"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "عمل &مجرد:‌"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "ممیز-ممیز )//("
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "دامنۀ &رده‌بندی‌ )»ایستا«("
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "ممیز-ستاره )/**  */("
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&پرس‌وجو )»ثابت«("
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "سبک:"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&حفاظت‌شده‌"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">تولید کد C++</p>"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "&پیاده‌سازی‌"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "تولید بدنۀ روش"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "پارامترها"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "برای رده‌ها در کد تولیدشده، از موارد زیر استفاده کنید:"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "پارامتر &جدید...‌"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "نام پارامتر نامعتبری را وارد کرده‌اید."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "بردار"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "نام پارامتر نامعتبر"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>متغیر</b>"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
 msgstr ""
-"نام پارامتری که انتخاب کرده‌اید\n"
-"هم اکنون در این عمل استفاده می‌شود."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "نام پارامتر، یکتا نیست"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "نام پارامتری که انتخاب کرده‌اید‌، هم اکنون در این عمل استفاده می‌شود."
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "رشته"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "نام عمل نامعتبری را وارد کرده‌اید."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">رشته</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "نام عمل نامعتبر"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">فهرست</p>"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
-"عملی با آن امضا از قبل در %1 وجود دارد.\n"
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "نام یا فهرست پارامتر متفاوتی را انتخاب کنید."
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "ویژگیهای نقش A"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "ویژگیهای نقش B"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>سراسری؟</i>"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "نمایانی نقش A"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "نمایانی نقش B"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "نام رده"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "تغییرپذیری نقش A"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">پروندۀ Include</p></i>"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "تغییرپذیری نقش B"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "تولید پروژه"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "فقره‌های شامل‌شده"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "ایجاد سند ساختن ANT"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "مستندات یاددداشت"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "روشهای تولید خودکار"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "خصیصۀ &جدید...‌"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "روشهای سازندۀ خالی"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "عمل &جدید...‌"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "روشهای دستیاب انجمن"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "قالبها"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "روشهای دستیاب خصیصه"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "قالب &جدید...‌"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "از شیء پدر"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "نویسه‌های لفظی شمارشی"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "دامنۀ دستیاب خصیصۀ پیش‌فرض:"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "نویسۀ لفظی شمارشی &جدید...‌"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "دامنۀ حوزۀ انجمن پیش‌فرض:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "خصیصه‌های هستار"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "از نقش پدر"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "خصیصۀ هستار &جدید...‌"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">تولید کد جاوا</p>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "فعالیت آغازین"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "درهم )#("
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "فعالیت پایانی"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "شروع-پایان )=begin  =end("
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "نوع فعالیت:"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">تولید کد Ruby</p>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "نام فعالیت:"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "زبان"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "رنگهای عنصر"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "پوشه‌ها"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "ویژگیهای خصیصه"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "نوشتن همۀ پرونده‌های تولید‌شده در پوشه:"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "مقدار &آغازین:‌"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&مرور...‌"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&عمومی‌"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&مرور...‌"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "نام خصیصۀ نامعتبری را وارد کرده‌اید."
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "پرونده‌های &Include سرآیند از پوشه:‌"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "نام خصیصۀ نامعتبر"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "پرونده‌های تولیدشده توسط مولد کد، در این پوشه نوشته می‌شوند"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "نام خصیصه‌ای که انتخاب کرده‌اید، هم اکنون در این عمل استفاده می‌شود."
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "نام خصیصه، یکتا نیست"
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"پرونده‌های درون این پوشه، به عنوان پرونده‌های سرآیند در کد تولیدشده استفاده "
+"می‌شوند."
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "برگزیدن عمل"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "سیاست جای‌نوشت"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "شمارۀ دنباله:"
+#: 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 ""
+"اگر پرونده‌ای با همان نام مولد کد بخواهد\n"
+"به عنوان پروندۀ خروجی که از قبل وجود دارد استفاده شود:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "عمل رده:"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&جای‌نوشت شود‌"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "عمل سفارشی:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "جای‌نوشت پرونده‌های موجود، اگر در پوشۀ مقصد وجود دارند"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&نمودارها‌"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&سؤال شود‌"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "پالایه"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "اگر پرونده‌ای با همان نام از قبل وجود دارد، بپرس چه کار کند"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "نمودار &جاری‌"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&استفاده از یک نام متفاوت‌"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&همۀ نمودارها‌"
+#: 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/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&برگزیدن نمودارها‌"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "قالب‌بندی"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&نوع نمودار‌"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "خطوط"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "گزینش"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "سبک پایان خط:"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "همکاری"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "نوع تورفتگی:"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "دنباله"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "مقدار تورفتگی:"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "آرایش"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "یونیکس )\"\\n\"("
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "نموداری برگزیده نشده است."
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "ویندوز )\"\\r\\n\"("
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "گزینه‌های نمایش"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "مکینتاش )\"\\r\"("
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "تنظیمات خصیصه"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "بدون تورفتگی"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "تنظیمات عمل"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "جهش"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "تنظیمات قالبها"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "فاصله"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "تنظیمات نویسه‌های لفظی شمارشی"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "درازنویسی توضیح"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "تنظیمات خصیصه‌های هستار"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"نوشتن توضیحات &برای بخشها، حتی اگر بخش \n"
+"خالی است"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "تنظیمات محتویات"
+#: 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/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "انجمنها"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&نوشتن توضیحات مستندات حتی در صورت خالی بودن"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "انجمنهای رده"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "نوشتن توضیحات &برای رده و مستندات روش، حتی در صورت خالی بودن‌"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&عملیات‌"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "گزینه‌های زبان"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&نمایانی‌"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "جادوگر تولید کد"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "امضای &عملیات‌"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "برگزیدن رده‌ها"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&بسته‌"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"همۀ رده‌هایی که می‌خواهید برای آن کد تولید کنید را\n"
+" در فهرست جانبی دست راست جا دهید"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&خصیصه‌ها‌"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "افزودن رده برای تولید کد"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&کلیشه‌"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "رده‌های برگزیده"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "امضای &خصیصه‌"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "حذف رده از تولید کد"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "ترسیم به عنوان دایره"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "رده‌های موجود"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "وضعیت آغازین"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "وضعیت تولید کد"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "وضعیت پایانی"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "فشار دکمۀ تولید، برای آغاز تولید کد"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "نوع وضعیت:"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "وضعیت تولید"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "نام وضعیت:"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "نمایش بلوکهای مخفی"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "رنگ عنصر"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">نام مؤلفه در اینجا</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "ردۀ جدید"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "نمایش نوع بلوک"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "خصیصه‌های رده"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "رنگها"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "عملیات رده"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "قلم:"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "ویژگیهای پارامتر"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "کاغذ:"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "جهت گذر"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "برگزیده:"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
-"«in» یک پارامتر فقط خواندنی، «out» پارامتر فقط نوشتنی و «inout» پارامتری است "
-"برای خواندن و نوشتن."
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">بلوک شیء UML</p>"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&تولید کردن‌"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">بلوک مخفی:</p>"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "تمام شدن"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">متن غیرقابل ویرایش:</p>"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "کد تولید شد"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">متن قابل ویرایش:</p>"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "تولید نشد"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "ویژگیهای نمودار"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "هنوز تولیدنشده"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "بزرگ‌نمایی:"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "پوشۀ %1 وجود ندارد. می‌خواهید اکنون آن را ایجاد کنید؟"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "٪"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "پوشۀ خروجی وجود ندارد"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "نمایش &توری‌"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "ایجاد پوشه"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "پرش &به توری‌"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "ایجاد نشود"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "اندازۀ مولفۀ پرش "
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/diagrampropertiespage.ui:205
+#, 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."
+"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 ""
-"نتوانست پوشه ایجاد کند.\n"
-"لطفاً، مطمئن شوید دارای دستیابی نوشتن در پوشۀ پدرش هستید، یا پوشۀ معتبر دیگری "
-"را برگزینید."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "خطای ایجاد پوشه"
+"باید اندازۀ مؤلفۀ پرش، چند برابر فاصله‌گذاری توری باشد.\n"
+"اگر »پرش به توری« فعال باشد، همیشه یک مؤلفه از ۴ طرف توری با توری همتراز "
+"می‌شود."
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "لطفاً، پوشۀ معتبری را برگزینید."
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+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/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
 msgstr ""
-"پروندۀ خروجی وجود دارد، ولی قابل نوشتن نیست.\n"
-"لطفاً، مجوزهای نوشتن مناسب را تنظیم کنید، یا پروندۀ دیگری را انتخاب نمایید."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "خطای نوشتن در پوشۀ خروجی"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "به نطر نمی‌رسد %1 یک پوشه باشد. لطفاً، پوشۀ معتبری را انتخاب کنید."
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "لطفاً، پوشۀ معتبری انتخاب کنید"
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-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/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
 msgstr ""
-"پروندۀ %1 از قبل در %2  وجود دارد.\n"
-"\n"
-"Umbrello می‌تواند پرونده را جای‌نویسی کرده، یک نام پروندۀ همانند را تولید "
-"نماید، یا این پرونده را تولید نکند."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&اعمال به همۀ پرونده‌های باقی‌مانده‌"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&جای‌نوشت‌"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&تولید نام پروندۀ همانند‌"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "پرونده تولید &نشود"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">گزینه‌ای در دسترس نیست.</p>"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "عرض خط:"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "تعدد"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "صادرات همۀ نماها "
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "تعدد را وارد کنید:"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&فهرست راهنما برای ذخیرۀ نمودارها در:‌"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "نام انجمن"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "فهرست راهنمای پایۀ مورد استفاده برای ذخیره کردن تصاویر"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "نام انجمن را وارد کنید:"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "نوع &تصویر:‌"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "نام نقش"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "استفاده از &پوشه‌ها‌"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "نام نقش را وارد کنید:"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr ""
+"ایجاد همان ساختار درختی استفاده‌شده در سند برای\n"
+"ذخیره کردن نماها در فهرست راهنمای هدف"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "نام عمل را وارد کنید:"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
+msgstr ""
+"نماها در پوشه‌های سند ذخیره می‌شوند. توسط این گزینه همان ساختار درختی "
+"استفاده‌شده در این سند، برای ذخیرۀ نماها، در فهرست راهنمای پایه می‌تواند ایجاد "
+"شود.\n"
+"فقط پوشه‌های ایجادشده توسط کاربر، در فهرست راهنما ایجاد می‌شوند )نمای منطقی، "
+"نمای مورد استفاده و مانند آن ایجاد می‌شوند(."
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "متن جدید را وارد کنید:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "تغییرپذیری نقش"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "خطا"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "نمایانی نقش"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "تغییر متن"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&صادر‌ات‌"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "تراز چپ"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "تراز راست"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&نمودار‌"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "تراز بالا"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&جدید‌"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "تراز پایین"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&نمایش‌"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "تراز میانی عمودی"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "بزرگ‌نمایی:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "تراز میانی افقی"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&کد‌"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "همتراز کردن توزیع عمودی"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&زبان فعال‌"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "همتراز کردن توزیع افقی"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"باید برای تراز کردن، حداقل دو شیء همانند رده‌ها یا کنشگر برگزینید. انجمنها را "
-"نمی‌توانید تراز کنید."
+"<p>به Umbrello خوش آمدید</p>\n"
+"<p>نمودارهای UML به شما اجازۀ طراحی و سندیت دادن نرم‌افزار جهت‌یافتۀ شیء را "
+"می‌دهد.  <a href=\"help:/umbrello\">کتاب مرجع Umbrello</a> مقدمۀ خوبی برای "
+"استفاده از UML است.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "این یک کلید‌واژۀ ذخیره‌شده برای زبان مولد کد پیکربندی‌شده است."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "کلید‌واژۀ ذخیره‌شده"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "در حال صادرات نما..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>به Umbrello ۱.۵. خوش آمدید. رده‌های انجمن، تولید کد Ruby، خارجی کردن "
+"پوشه‌ها، توانایی تغییر واسطها به رده‌ها و غیره در این نسخۀ جدید است.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"هنگام صادرات تصویر، خطایی رخ داد:\n"
+"<p>نمودارهای جهش‌یافته و پوشه‌های خارجی‌شده به طور دستی انحصاری هستند. اگر نیاز "
+"به پوشه‌های خارجی دارید، پس »استفاده از نمودارهای جهش‌یافته« را در تنظیمات "
+"عمومی از گزینش خارج کنید.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"پروندۀ برگزیدۀ %1 وجود دارد.\n"
-"می‌خواهید آن را جای‌نوشت کنید؟"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "پرونده از قبل وجود دارد"
+"<p>اکثر فقره‌های نمودار نمی‌توانند تغییر اندازه دهند، خودشان برای تناسب با "
+"محتویاتشان تغییر اندازه می‌دهند.\n"
+"جعبه‌ها، یادداشتها و پیامهای نمودار دنباله می‌توانند تغییر اندازه دهند، فقط "
+"با  فشار دادن و کشیدن دنبالۀ قرمز.</p>\n"
 
-#: model_utils.cpp:244
-msgid "new_actor"
+#: 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 ""
+"<p>اگر می‌خواهید یک ردۀ موجود را به نموداری اضافه کنید، فقط مدخل آن را از "
+"درخت‌ نما بکشید.</p>\n"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
+#: 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 ""
+"<p>عامل مجدد Umbrello، به شما اجازۀ حرکت عملیات بین یک رده و رده‌های مشتق و "
+"پایۀ\n"
+" آن را می‌دهد.\n"
+"برای باز کردن عامل مجدد، دکمۀ راست موشی را فشار دهید.</p>\n"
 
-#: model_utils.cpp:248
-msgid "new_package"
+#: 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 ""
+"<p>اشیای نمودار دنباله می‌توانند جعبۀ سازنده داشته و به عنوان کنشگر ترسیم "
+"شوند. برای\n"
+" محاورۀ ویژگیها دو بار فشار دهید.</p>\n"
 
-#: model_utils.cpp:250
-msgid "new_component"
+#: 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 ""
+"<p>پیامهای نمودار دنباله به عنوان سازنده می‌توانند عمل کنند. برای ایجاد "
+"سازنده، روی جعبۀ شیء )به جای خط عمودی( فشار دهید.</p>\n"
 
-#: model_utils.cpp:252
-msgid "new_node"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
+"<p>نمودارهای دنباله، پیامها را در خودشان پشتیبانی می‌کنند. برای ایجاد یک پیام "
+"خودکار، همان خط عمودی را دوباره فشار دهید. </p>\n"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: 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 ""
+"<p>اگر هنگام بارگذاری پروندۀ خارجی، چیزی در نمای فهرست نمایش داده نشود، سعی "
+"کنید مدل را تحت نامی متفاوت ذخیره کرده،\n"
+"پروندۀ ذخیره‌شده را بسته و مجدداً بارگذاری کنید. معمولاً نمای فهرست پس از آن "
+"عمومی می‌شود.\n"
+"</p>\n"
 
-#: model_utils.cpp:256
-msgid "new_interface"
+#: 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 ""
+"<p>برش و رونوشت، تصاویر را نیز به یک تخته یادداشت PNG صادر می‌کند، که بتواند "
+"در KWord\n"
+" و کاربردهای دیگر بچسبد.</p>\n"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
+#: 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 ""
+"<p>انجمنها نباید در خطوط طولانی باشند، دو بار فشار بر روی یکی، نقطۀ متحرکی "
+"را ایجاد می‌کند.</p>\n"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr ""
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>می‌توانید ذخیرۀ خودکار را در محاورۀ Umbrello پیکربندی کنید.</p>\n"
 
-#: model_utils.cpp:262
-msgid "new_entity"
+#: 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 ""
+"<p>آیا فاقد ویژگی مورد نیاز شما در Umbrello است؟ لطفاً، اجازه دهید ما هم "
+"بدانیم.\n"
+"یا توسط گزارش اشکال از گزینگان کمک آن را به دادگان اشکالات اضافه کرده، یا\n"
+"به فهرست نامۀ توسعه‌دهندگان uml بفرستید.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr ""
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr "<p>می‌توانید همۀ اشیای برگزیده را با فشار حذف یا پس‌بر حذف کنید.</p>\n"
 
-#: model_utils.cpp:268
-msgid "new_object"
+#: 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 ""
+"<p>اگر اشکالی را در Umbrello یافته‌اید، لطفاً، اجازه دهید ما هم بدانیم.\n"
+"می‌توانید اشکالات را با ابزار گزارش اشکال در گزینگان کمک، ارائه کنید.</p>\n"
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "خالی"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "نشانوند بد شکل"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "نوع نشانوند ناشناخته"
-
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "نام روش غیر مجاز"
-
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "نوع بازگشت ناشناخته"
-
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "خطای نامشخص"
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "افزودن ردۀ پایه"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "افزودن ردۀ مشتق‌شده"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "افزودن عمل"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "افزودن خصیصه"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "افزودن واسط پایه"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "افزودن واسط مشتق‌شده"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "رده‌بندیهای پایه"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "رده‌بندیهای مشتق‌شده"
-
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "نمی‌توان فهرست راهنما را ایجاد کرد: %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 ""
+"<p>فشار کلید گریز، ابزار جاری را با ابزار گزینش تنظیم می‌کند.\n"
+"کلید پس‌بر به ابزار مورد استفادۀ قبلی پرش می‌کند.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "نمی‌توان نموداری خالی را ذخیره کرد"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>همۀ اشیا را با فشار مهار-A می‌توانید برگزینید</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "هنگام ذخیرۀ نمودار در %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 ""
+"<p>ردۀ جدیدی را با استفاده از جادوگر ردۀ جدید در گزینگان کد، می‌توانید ایجاد "
+"و برپا کنید.</p>\n"
diff --git a/tde-i18n-fi/messages/tdesdk/umbrello.po b/tde-i18n-fi/messages/tdesdk/umbrello.po
index 4fe4c4476e1..c006189e4da 100644
--- a/tde-i18n-fi/messages/tdesdk/umbrello.po
+++ b/tde-i18n-fi/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-06-22 15:58+0300\n"
 "Last-Translator: Jari-Matti Mäkelä <jmjm@iki.fi>\n"
 "Language-Team:  <fi@li.org>\n"
@@ -15,251 +15,208 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML mallintajan automaattinen koodin kehittäjä"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Muunnettava tiedosto"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Käytettävä XSLT-tiedosto"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML mallintajan "
-"tekijät"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML mallintajan tekijät"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Ilpo Kantonen"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Vie kaikki näkymät..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "ilpo@iki.fi"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Joitakin virheitä tapahtui kuvien viennissä:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Anna aktiviteetin nimi"
 
-#: 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 "Tiedostoa %1 ei pystytty kirjoittamaan"
+#: 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 "Anna uuden aktiviteetin nimi"
 
-#: 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 "Tallennusvirhe"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Asettelu vasemmalle"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekti"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Asettelu oikealle"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Tahdistettu viesti"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Asettelu ylös"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Tahdistamaton viesti"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Asettelu alas"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Assosiaatio"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Asettelu pystysuunnassa keskelle"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Säiliö"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Asettelu vaakatasossa keskelle"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ankkuri"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Asettelu pystysuunnassa keskelle"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Nimike"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Asettelu vaakatasossa keskelle"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Viesti"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Kohdistukseen on valittava vähintään 2 kohdetta kuten luokkia tai aktoreita. "
+"Et voi kohdistaa assosiaatioita."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Laatikko"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Muotoilu"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktori"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Riippuvuus"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Yleistäminen"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregaatti"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Suhde"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Suunnattu assosiaatio"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Toteuttaa (Yleistys/Realisointi)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompositio"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Käyttötapaus"
-
-#. 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 "Luokka"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Alkutila"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Lopputila"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Hajota/Lomita"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Eriytä/Liitä"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pakkaus"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponentti"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Paketti"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Riippuvuus"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Teos"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Assosiaatio"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Rajapinta"
+#: association.cpp:88
+msgid "Self Association"
+msgstr ""
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tietotyyppi"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Yhteistyöviesti"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Lueteltu tyyppi"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sekvenssiviesti"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entiteetti"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr ""
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Syvä historia"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Matala historia"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Säiliö"
 
-#: worktoolbar.cpp:277
-#, fuzzy
-msgid "Join"
-msgstr "Liity"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompositio"
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "Jaa"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Toteuttaminen"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Liitos"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni assosiaatio"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Valinta"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ankkuri"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Tilasiirtymä"
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Tilasiirtymä"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktiviteetti"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Tila"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Kerroin"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Anna lukumäärä:"
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Assosiaation nimi"
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Anna assosiaation nimi:"
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Roolin nimi"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Anna roolin nimi:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
+"Samalla nimellä ja allekirjoituksella on jo olemassa toiminto. Et voi lisätä "
+"sitä uudelleen."
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Aktiviteetin alkuarvo"
+#: 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 "Epäkelpo nimi:"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Viesti"
+#: 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 "Epäkelpo nimi"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "MÄÄRITTELEMÄTÖN"
+#: 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 "Tämä nimi on jo käytössä."
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Valitse"
+#: 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 "Tämä nimi ei ole yksilöllinen"
 
 #: 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."
+"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 ""
-"Ainakin yksi kohde on jäänyt tuomatta leikepöydältä, koska samanniminen kohde "
-"on jo olemassa. Kaikki muut on lisätty."
+"Ainakin yksi kohde on jäänyt tuomatta leikepöydältä, koska samanniminen "
+"kohde on jo olemassa. Kaikki muut on lisätty."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -278,10 +235,8 @@ msgid "Cannot Open File"
 msgstr "Tiedosta ei voitu avata"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kansiota ei voitu luoda:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Kansiota ei voitu luoda:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1329 +250,1512 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Kansiota ei voitu luoda"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Anna tilan nimi"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Yleisasetukset"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Anna uuden tilan nimi:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Pakkaus on nimiavaruus"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Syötä aktiviteetti"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuaalihajottimet"
 
-#: 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 "Anna uuden aktiviteetin nimi"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Luo tyhjät koodipohjat muodostimiin"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "uusi aktiviteetti"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Luo accessor-metodit"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Umbrello UML mallintaja"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Metodit ovat inline-optimoitavia"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Loogiset kaaviot"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Aksessorit ovat inline-tyyppiä"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Käyttötapaukset"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Aksessorit ovat julkisia"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentit"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Tuodaan tiedostoa: %1 Edistyminen: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Sijoittelunäkymä"
+#: 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 "Valmis."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entiteettien suhdemalli"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Onko näkyvyys %1 nimiavaruus vai luokka?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tietotyypit"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ tuonti pyytää apuasi"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Käytetty mallinnus on muuttunut.\n"
-"Haluatko tallentaa sen?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Nimiavaruus"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Tiedostoa %1 ei löytynyt."
+#: 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 "Luokka"
 
-#: 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 "Tiedostonlukuvirhe"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Sisäinen virhe"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Tiedosto %1 näyttää vioittuneelta."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntaksivirhe ennen %1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Pakatussa tiedostossa %1 ei ollut XMI-tiedostoa."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Jäsennysvirhe ennen %1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Paketista avattua tiedostoa %1 ei pystytty lukemaan:"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Tiedostoa %1 ei pystytty lukemaan"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "lauseke puuttuu"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Tiedoston %1 siirrossa (upload) tapahtui virhe"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Määrittelyn syntaksivirhe"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "käyttötapauskaavio"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} puuttuu"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "luokkakaavio"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "nimiavaruus puuttuu"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sekvenssikaavio"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ puuttuu"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "yhteistyökaavio"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Nimiavaruuden nimi puuttuu"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "tilakaavio"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Tarvitsee selvitettävän tyypin tarkentimen"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "aktiviteettikaavio"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "määrittely puuttuu"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponenttikaavio"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Vakiolauseke puuttuu"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "sijoittelukaavio"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' puuttuu"
 
-#: umldoc.cpp:950
-#, fuzzy
-msgid "entity relationship diagram"
-msgstr "käsitekaavio"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} puuttuu"
 
-#: 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 "Nimi"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "Anna nimi:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Yliluokan määrittely puuttuu"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Tämä on epäkelpo nimi kaaviolle."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Alustuslauseke puuttuu"
 
-#: 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 "Epäkelpo nimi"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Muuttuja puuttuu"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Kaavio käyttää jo tätä nimeä."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Tyypin id puuttuu"
 
-#: 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 "Tämä nimi ei ole yksilöllinen"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Luokan nimi puuttuu"
 
-#: 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 "Epäkelpo nimi:"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "ehtolauseke puuttuu"
 
-#: 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 "Tämä nimi on jo käytössä."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "lause puuttuu"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for alustus puuttuu"
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch puuttuu"
+
+#: 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 "&Ominaisuudet"
+
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Aktiviteetin alkuasetus"
+
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
-"Antamasi nimi ei ole yksilöllinen.\n"
-"Tarkoititko tätä?"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nimi ei ole ainutkertainen."
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Hajota/Lomita"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Käyttönimi"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Eriytä/Liitä"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Anna uusi nimi"
+#: 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 "Yleinen"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Haluatko todella poistaa kaavion %1?"
+#: 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 "Yleisasetukset"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Poista kaavio"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Aktiviteetin tyyppi:"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Alustaa dokumenttia..."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Aktiviteetin nimi:"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Selvittää objektin referenssit..."
+#: 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 "Dokumentaatio"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Lataa UML-elementtejä..."
+#: 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 "Fontti:"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Lataa diagrammeja..."
+#: 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 "Fonttiasetukset"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "TDE-UML-Kaavio"
+#: 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 "Väri"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/automaattitallenna%1"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Elementtien värit"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktiviteetit"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Anna mallin nimi"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Uusi aktiviteetti..."
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Anna mallin uusi nimi:"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Poista ankkuri"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Näkymät"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Vaihda nimeä"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Antamasi nimi on epäkelpo.\n"
-"Luontia ei ole tehty."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Uusi aktiviteetti"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nimi on epäkelpo."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "uusi aktiviteetti"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Antamasi nimi ei ollut yksilöllinen!\n"
-"Luonti on keskeytetty."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Uudelleennimeä aktiviteetti"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Luonti keskeytetty"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Anna aktiviteetin uusi nimi:"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Lataa luettelonäkymää..."
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nimi:"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Kansio pitää olla tyhjä ennen poistamista."
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tyyppi:"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Kansio ei ole tyhjä"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Assosiaatiot"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Samalla nimellä ja allekirjoituksella on jo olemassa toiminto. Et voi lisätä "
-"sitä uudelleen."
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Assosiaation ominaisuudet"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Anna aktiviteetin nimi"
+#: 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 "Yleisasetukset"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "uusi tila"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roolit"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Yleistäminen"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Roolin asetukset"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Assosiaation fontti"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Yhteistyöviesti"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Roolin A ominaisuudet"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sekvenssiviesti"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Roolin B ominaisuudet"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr ""
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Roolin A näkyvyys"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Roolin B näkyvyys"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Toteuttaminen"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Roolin A muunneltavuus"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni assosiaatio"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Roolin B muunneltavuus"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Export"
-msgstr "Vi&e"
+msgid "Rolename:"
+msgstr "Roolin nimi:"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagrammi"
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, fuzzy, no-c-format
+msgid "Multiplicity:"
+msgstr "Lukumäärä"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: 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 "&New"
-msgstr "&Uusi"
+msgid "Public"
+msgstr "Julkinen"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: 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 "Sh&ow"
-msgstr "Näy&tä"
+msgid "Private"
+msgstr "Yksityinen"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Koodi"
+msgid "Protected"
+msgstr "Suojattu"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
-msgstr "Aktiivinen kie&li"
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Toteutus"
 
-#. 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
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Documentation"
-msgstr "Dokumentaatio"
+msgid "Changeable"
+msgstr "Muutettavissa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Slash-slash (//)"
+msgid "Frozen"
+msgstr "Jäädytetty"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Slash-tähti (/**  */)"
+msgid "Add only"
+msgstr "Lisää vain"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Tyyli:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Luokan &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ koodingenerointi</p>"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Aktorin &nimi:"
 
-#. 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 "Yleinen"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Paketin &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr "Metodin koodipohjan luonti"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Käyttötapauksen &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Käytä generoidussa koodissa seuraavaa luokille:"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Rajapinnan &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponentin &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektori"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Jäänteen &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Muuttuja</b>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Luetellun tyypin &nimi"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Tietotyypin &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entiteetin &nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotyypin nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Paketin nimi:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstrakti luokka"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstrakti käyttötapaus"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globaali?</i>"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "Suorit&ettava"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Piirrä"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Luokan nimi"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Oletus"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Sisällytettävä tiedosto</p></i>"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Täyte:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projektinluonti"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Kir&jasto"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Luo ANT build dokumentti (build.xml)"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Taulukko"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Luo metodien koodipohjat automaattisesti"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Näkyvyys"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Muodostimien koodipohjat"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "J&ulkinen"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Accessor-metodien assosiointi"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&Yksityinen"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Attribuuttien aksessorimetodit"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
 
-#. 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 "Julkinen"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "&Toteutus"
 
-#. 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 "Yksityinen"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Luokan nimi:"
 
-#. 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 "Suojattu"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instanssin nimi:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr ""
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Piirrä aktorina"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Attribuutin accessorin oletusnäkyvyys:"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Monitoteutus"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Assosiaation oletusnäkyvyys:"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Näytä erillisinä"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr ""
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponentin nimi:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java-koodin luonti</p>"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Paketin nimi:"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr ""
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotyypin nimi:"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: 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 ""
+"Valitsemasi nimi\n"
+"on jo käytössä.\n"
+"Nimi on palautettu."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby-koodin luonti</p>"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Nimi ei ole yksilöllinen"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attribuutit"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Uusi &attribuutti..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Metodit"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Uusi m&etodi..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Mallit"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Uusi &Malli..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Luetellun tyypin literaalit"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Uusi lit&eraali"
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entiteetin attribuutit"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "&Uusi attribuutti..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Poista ankkuri"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Ominaisuudet"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Näytä"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Toimi&nnot"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "Näky&vyys"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "&Metodin allekirjoitus"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&kkaus"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ribuutit"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&yyppi"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibuutin allekirjoitus"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Piirrä ympyränä"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Näyttö"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Näyttöasetukset"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribuuttien asetukset"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Metodien asetukset"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Malliasetukset"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Lueteltujen literaalien asetukset"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Attribuuttien asetukset"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Säiliö"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Sisältöasetukset"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Luokka-assosiaatiot"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "uusi_luokka"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Uusi luokka"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Luokan attribuutit"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Luokan metodit"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Koodinluonnin optiot"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Kieli"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Luo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Kansiot"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Lopetus"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Kirjoita luodut tiedostot kansioon:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Koodinluonti"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Selaa..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ei ole luotu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "S&elaa..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ei ole vielä luotu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "S&isällytä header-tiedostoja kansiosta"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Kansiota %1 ei ole. Haluatko luoda sen nyt?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Koodingeneroinnissa tuotetut tiedostot tulevat tähän kansioon."
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Tuloskansiota ei ole"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Luo kansio"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Älä luo"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
-msgstr "Tämän kansion tiedostot ovat header-tiedostoja koodin generoinnissa."
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
+msgstr ""
+"Kansiota ei voitu luoda.\n"
+"Tarkista kirjoitusoikeudet ylemmän tason kansioon tai valitse toinen "
+"kelvollinen kansio."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Tiedoston ylikirjoitussäännöt"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Virhe kansion luonnissa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Ole hyvä ja valitse kelvollinen kansio."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Jos koodingenerointi yrittää luoda samannimistä\n"
-"tiedostoa, joka on jo olemassa:"
+"Kohdekansio on olemassa, mutta ei kirjoitettavana.\n"
+"Aseta sen kirjoitusoikeudet tai valitse toinen kansio."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "K&orvaa"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Virhe kohdekansioon kirjoituksessa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Ylikirjoita samannimiset nykyiset tiedostot kohdehakemistossa"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 ei näytä kansiolta. Ole hyvä ja valitse kelvollinen kansio."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Kysy"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Ole hyvä ja valitse kelvollinen kansio"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Jos samanniminen tiedosto on jo olemassa, kysy mitä tehdä"
+msgid "Code Viewer"
+msgstr "Koodin näyttö"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Käytä m&uuta nimeä"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Ei optioita saatavilla.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Jos tiedosto on jo olemassa kohdekansiossa, valitse toinen nimi lisäämällä "
-"tiedostopääte nimeen."
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammit"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Muotoilu"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Suodatin"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Rivit"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Käytössäoleva kaavio"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Rivinvaihtomerkin tyyli:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "K&aikki diagrammit"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Sisennyksen tyyppi:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "Valit&se kaaviot"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Sisennyksen määrä:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "Diagrammin &tyyppi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Valinta"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Käyttötapaus"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Yhteistyö"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvenssi"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Tila"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponentti"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Sijoittelu"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "TDE-UML-Kaavio"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Kaaviota ei ole valittu."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+msgid "The format that the images will be exported to"
+msgstr "Vietävän kuvan muoto"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Kohdetiedosto on jo olemassa"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Tiedosto %1 on jo olemassa kansiossa %2.\n"
+"\n"
+"Umbrello voi ylikirjoittaa tiedoston, luoda samanlaisen\n"
+"tai ei luoda samanlaista tiedostoa."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "Tee k&aikille jäljelläoleville tiedostoille"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Ei sisennystä"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Ylikirjoita"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulointi"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Luo samanlainen tiedostonnimi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Tila"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Ä&lä luo tiedostoa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Kommentin näkyvyys"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parametrin ominaisuudet"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "Kirjoita kommentit jopa tyhjiin alueisiin"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tyyppi:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nimi:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Alkuarvo:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Välityssuunta"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Kirjoittaa kommentit jopa tyhjiin luokan eri osiin (public, private jne)."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Kirjoita dokumentoinnin kommentit jopa tyhjänä"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Sisällytetyt osat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Kirjoittaa kommentit jopa &tyhjiin luokkiin ja metodeihin."
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Valitse toiminto"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Kieliasetukset"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sekvenssin numero:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Koodinluontivelho"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Luokkatoiminto:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Valitse luokat"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Oma toiminto:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Umbrellon asetukset"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Käyttöliittymä"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Käyttöliittymän asetukset"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Rivin väri:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Ol&etusväri"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Täyteväri:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Oletus&väri"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Rivinpituus:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Oletus&pituus"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "Käytä täyteväriä olet&uksena"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Sijoita kaikki luokat oikeanpuoleiseen listaan,\n"
-"joista haluat generoida koodin"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Lisää luokka koodingenerointiin"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Salli peruutukset"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Valitut luokat"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "Käytä välilehtiä kaavioisssa"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Poista luokka koodinluonnista"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Käytä uutta C++/Java/Ruby koodigeneraattoria"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Käytettävissä olevat luokat"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Käytä kulmikkaita assosiaatioviivoja"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Koodinluoonnin tila"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automaattinen talletus"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Paina Luo-nappia aloittaaksesi koodinluonnin"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Salli automaattin&en talletus"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Luonnin tila"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Valitse automaattisen talletuksen talletusten aikaväli (minuutteja):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Koodin näyttö"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Aseta automaattisen talletuksen tiedostopääte:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Näytä piilotetut lohkot"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">komponentin nimi tähän</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Aloitus"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Näytä lohkon tyyppi"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Alkulogo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Värit"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "Päivän vihjee&t"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Fontti:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Lataa viimeiksitallennettu projekti"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Tausta:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Aloita uusi projekti:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Valittu:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Ei kaaviota"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML objektin lohko:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Luokkakaavio"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Piilotettu lohko:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Käyttötapauskaavio"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Editoimaton teksti:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sekvenssikaavio"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Editoitava teksti:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Yhteistyökaavio"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Kaavion ominaisuudet"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Tilakaavio"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nimi:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Aktiviteettikaavio"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zoom:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponenttikaavio"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Sijoittelukaavio"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Luokka-asetukset"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Näytä näky&vyys"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Näytä attribuutit"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Näytä toiminnot"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Näytä stereot&ypia"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Näytä attribuutin allekirjoitus"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Näytä pakkaus"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Näytä metodin allekirjoitus"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Näytä &hila"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Oletusnäkyvyys"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Sovi&ta hilaan"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Oletusnäkyvyys attribuutille:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Sovita komponentin koko"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Oletusnäkyvyys toiminnolle:"
 
-#. 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."
-msgstr ""
-"Napsauta komponentin kokoa kasvattaaksesi kokoa hilassa.\n"
-"Jos hilaan sovittaminen on asetettu, kaikki 4 sivua sovitetaan hilaan."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Koodinluonti"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Hilan välit:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Koodinluonnin asetukset"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Koodin näytön asetukset"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Alkutila"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Rivinpituus:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Lopputila"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Vie kaikki näkymät"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tilan tyyppi:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Kansio, jonne kaaviot talletetaan:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Tilan nimi:"
 
-#. 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"
-msgstr "Peruskansio, jonne kuvat talletetaan"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Elementin väri"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Kuvan tyypp&i:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribuutin ominaisuudet"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Vietävän kuvan muoto"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Luokkakohtainen &näkyvyys (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Käytä &kansioita"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Suojattu"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "&Toteutus"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Olet antanut epäkelvon attribuutin nimen."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attribuutin arvo epäkelpo"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Valitsemasi attribuutin nimi on jo käytössä tässä toiminnossa."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Roolien ominaisuudet"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attribuutin nimi ei ole yksilöllinen"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Roolin nimi:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Entiteetin attribuutin ominaisuudet"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, fuzzy, no-c-format
-msgid "Multiplicity:"
-msgstr "Lukumäärä"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Oletusarvo"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Roolin muutettavuus"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Pituus/arvot:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Lisää vain"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automaattilisäys"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Jäädytetty"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Salli &null"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Muutettavissa"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attribuutit"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Roolin näkyvyys"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksointi"
 
-#. 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 "Toteutus"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Ei mikään"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Tervetuloa Umbrelloon.</p>\n"
-"<p>UML mallit auttavat suunnittelemaan ja dokumentoimaan objektiorientoituneita "
-"ohjelmia.  <a href=\"help:/umbrello\">Umbrellon käsikirja</a> "
-"on hyvä johdatus UML:n käyttöön.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Pää"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Tervetuloa Umbrello 1.5 -oohjelmaan.  Tässä versiossa on uutta "
-"assosiaatioluokat, Ruby koodin kehitys, kansioiden ulkoistus, kyky vaihtaa "
-"rajapinnat luokiksi, ja muuta.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeksoi"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Yksilöllinen"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Suurinta osaa kaavioiden kappaleiden kokoa ei voi muuttaa. Ne skaalautuvat "
-"automaattisesti niille varattuun tilaan.\n"
-"Laatikkojen, muistioiden ja sekvenssikaavioiden viestien kokoa voi muuttaa "
-"klikkaamalla niitä ja vetämällä hiirellä punaisesta neliöstä.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Olet antanut epäkelvon attribuutin nimen."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Jos haluat lisätä kaavioon jo olemassaolevan luokan, siirrä (drag+drop) se "
-"hiirellä puunäytöstä.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Attribuutin arvo epäkelpo"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Umbrellon uusi refactoring agentilla voit siirtää toimintoja johdettujen ja "
-"kantaluokkien välillä\n"
-"Refactoring agent avautuu luoksta hiiren oikeanpuoleisella napilla.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "Valitsemasi attribuutin nimi on jo käytössä tässä toiminnossa."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Sekvenssikaavioiden olioilla voi olla hajoitinlaatikko ja ne voidaan piirtää "
-"aktoreina.  Kaksoisklikkaa yhtä ominaisuusdialogin esillesaamiseksi.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Attribuutin nimi ei ole yksilöllinen"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sekvenssikaavioiden viestit voivat toimia muodostimina. Klikkaa "
-"kohdelaatikkoa (mieluummin kuin viivaa) tehdäksesi sille muodostimen.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Toimintojen ominaisuudet"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstrakti toiminto"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Kysely (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Leikkaa ja kopioi vie kuvan PNG-leikepöydälle. Sen voi liittää\n"
-"KWordiin ja toisiin sovelluksiin.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametrit"
 
-#: tips.txt:66
-#, fuzzy
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Assosiaatioiden ei tarvitse olla suoria. Assosiaation kaksoisklikkaus luo "
-"siirreltävän pisteen.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "&Uusi parametri..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Voit asettaa automaattitallennuksen Muokkaa Umbrellon asetuksia "
-"valikossa.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Olet antanut epäkelvon parametrin nimen."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Puuttuuko Umbrellosta jokin ominaisuus? Kerro siitä meille. \n"
-"Voit vaihtoehtoisesti lisätä bugin bugitietokantaan Ilmoita virheestä "
-"-toiminnolla Help-valikossa.\n"
-"Voit lähettää bugiraportin myös uml-devel postituslistalle.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parametrin nimi epäkelpo."
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Voit poistaa kaikki valitut objektit painamalla Del tai Backspace "
-"-näppäintä.</p>\n"
+"Antamasi parametrin nimi on jo\n"
+"käytössä tässä toiminnossa."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Jos olet löytänyt bugin Umbrellosta, kerro siitä meille.\n"
-"Voit lähettää ilmoituksen Ilmoita virheestä -työkalulla Help-valikossa.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parametrin nimi ei ole yksilöllinen"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Esc-näppäimen painallus asettaa nykyisen työkalun käyttöön.\n"
-"Backspace ottaa käyttöön aiemmin käytetyn työkalun.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Valitsemasi parametri on jo käytössä tässä toiminnossa."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Olet valinnut epäkelvon toiminnon."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Epäkelpo toiminnon nimi"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Toiminnolla on jo allekirjoitus %1:ssa.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Valitse toinen nimi tai parametrilista."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Roolien ominaisuudet"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Mallin ominaisuudet"
 
-#: tips.txt:103
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Olet antanut epäkelvon mallin nimen."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Epäkelpo mallin nimi"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Voit valita objektin painamalla Ctrl-A.</p>\n"
+"Valitsemasi mallipohjan parametrin nimi on jo käytössä tässä toiminnossa."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Mallipohjan nimi ei ole yksilöllinen"
 
-#: tips.txt:108
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Luokkanäytön asetukset"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagrammin värit"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Antamasi nimi on epäkelpo."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Antamasi nimi on jo käytössä."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nimi ei ole ainutkertainen."
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Rivi:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Täyte:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Ol&etus"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Käytä täytettä"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Vie kaikki näkymät..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Joitakin virheitä tapahtui kuvien viennissä:"
+
+#: 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 "Tiedostoa %1 ei pystytty kirjoittamaan"
+
+#: 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 "Tallennusvirhe"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML mallintajan automaattinen koodin kehittäjä"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Muunnettava tiedosto"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Käytettävä XSLT-tiedosto"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Voit luoda ja asettaa uuden luokan käyttämällä Code-menun uuden luokan "
-"luontivelhoa.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML "
+"mallintajan tekijät"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML mallintajan tekijät"
+
+#: 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 "Nimi"
+
+#: 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 "Anna nimi:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Anna metodin nimi:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Anna uusi teksti:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "VIRHE"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Vaihda teksti"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Kansiota %1 ei ollut."
+
+#: 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 "Tiedostonlukuvirhe"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Kansiota %1 ei voida avata."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1671,6 +1809,10 @@ msgstr "Uusi toiminto..."
 msgid "Select Operation..."
 msgstr "Valitse toiminto..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Muuta tekstiä..."
@@ -1723,6 +1865,19 @@ msgstr "Uusi"
 msgid "Rename..."
 msgstr "Uudelleennimeä..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Liittämisvirhe"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Rivin väri..."
@@ -1751,14 +1906,26 @@ msgstr "Sisäistä kansio"
 msgid "Import Classes..."
 msgstr "Tuo luokkia..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pakkaus"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Alijärjestelmä"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Teos"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponenttikaavio..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Paketti"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Sijoittelukaavio..."
@@ -1767,11 +1934,19 @@ msgstr "Sijoittelukaavio..."
 msgid "Folder"
 msgstr "Kansio"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entiteetti"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Käsitekaavio..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktori"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Käyttötapauskaavio..."
@@ -1808,6 +1983,18 @@ msgstr "Uusi attribuutti..."
 msgid "Export as Picture..."
 msgstr "Vie kuvana..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Rajapinta"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tietotyyppi"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Lueteltu tyyppi"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Luokkakaavio..."
@@ -1828,26 +2015,10 @@ msgstr "Sekvenssikaavio..."
 msgid "Collaboration Diagram..."
 msgstr "Yhteistyökaavio..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attribuutit"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Metodit"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Vain julkinen"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Näkyvyys"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Metodin allekirjoitus"
@@ -1860,11 +2031,6 @@ msgstr "Attribuutin allekirjoitus"
 msgid "Stereotype"
 msgstr "Stereotypia"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Näytä"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribuutti..."
@@ -1889,14 +2055,6 @@ msgstr "Täyteväri..."
 msgid "Use Fill Color"
 msgstr "Käytä täyteväriä"
 
-#: 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 "Väri"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktori..."
@@ -1925,10 +2083,26 @@ msgstr "Lueteltu tyyppi..."
 msgid "Package..."
 msgstr "Pakkaus..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Alkutila"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Lopputila"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Tila..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Aktiviteetin alkuarvo"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Alijärjestelmä..."
@@ -1973,6 +2147,14 @@ msgstr "Poista ankkuri"
 msgid "Change Association Name..."
 msgstr "Vaihda assosiaation nimeä..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Tyhjennä kaavio"
@@ -2007,193 +2189,103 @@ msgstr "tiedoston kansio"
 
 #: 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 "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML mallintajan tekijät"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Assosiaation väärä käyttätapa."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Assosiointivirhe"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Kansiota %1 ei ollut."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Kansiota %1 ei voida avata."
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "uusi_aktori"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Ilpo Kantonen"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "uusi_käyttötapaus"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "ilpo@iki.fi"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "uusi_pakkaus"
 
-#: 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 "Valmis."
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "uusi_komponentti"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "uusi_paketti"
 
-#: 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."
+#: model_utils.cpp:254
+msgid "new_artifact"
 msgstr ""
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Onko näkyvyys %1 nimiavaruus vai luokka?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ tuonti pyytää apuasi"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Nimiavaruus"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Tuodaan tiedostoa: %1 Edistyminen: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Sisäinen virhe"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntaksivirhe ennen %1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Jäsennysvirhe ennen %1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "lauseke puuttuu"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Määrittelyn syntaksivirhe"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} puuttuu"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "nimiavaruus puuttuu"
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ puuttuu"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "uusi_käyttöliittymä"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Nimiavaruuden nimi puuttuu"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "uusi_tietotyyppi"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Tarvitsee selvitettävän tyypin tarkentimen"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "uusi_lueteltu_tyyppi"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "määrittely puuttuu"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "uusi_entiteetti"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Vakiolauseke puuttuu"
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "uusi_paketti"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' puuttuu"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "uusi_assosiaatio"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} puuttuu"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "uusi_objekti"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Yliluokan määrittely puuttuu"
-
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Alustuslauseke puuttuu"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Tyhjä"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Muuttuja puuttuu"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Huonostimuotoiltu argumentti"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Tyypin id puuttuu"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tuntematon argumentin tyyppi"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Luokan nimi puuttuu"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Epäkelpo metodinnimi"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "ehtolauseke puuttuu"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tuntematon paluuarvon tyyppi"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "lause puuttuu"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Määrittelemätön virhe"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for alustus puuttuu"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Tämä on koodigeneraattorin varattu sana."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch puuttuu"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Varattu sana"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2207,105 +2299,67 @@ msgstr "Anna objektin nimi:"
 msgid "new_parameter"
 msgstr "uusi_parametri"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Yleisasetukset"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Pakkaus on nimiavaruus"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuaalihajottimet"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Luo tyhjät koodipohjat muodostimiin"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Luo accessor-metodit"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Metodit ovat inline-optimoitavia"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Aksessorit ovat inline-tyyppiä"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Aksessorit ovat julkisia"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Kaavio: %2 Sivu %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Anna kaavion nimi"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Lisää yliluokka"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Anna kaavion uusi nimi:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Lisää aliluokka"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Olet poistamassa kaaviota.\n"
-"Oletko varma?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Lisää metodi"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Poista kaavio?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Lisää attribuutti"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Uudelleennimeäminen keskeytetty"
+#: refactoring/refactoringassistant.cpp:297
+#, fuzzy
+msgid "Add Base Interface"
+msgstr "Lisää peruskäyttöliittymä"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Lisää perivä käyttöliittymä"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Toimintoa ei ole toteutettu"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Yliluokat"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Antamasi nimi on epäkelpo.\n"
-"Uudelleennimeäminen on keskeytetty."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Aliluokat"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "uusi_assosiaatio"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Anna tilan nimi"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "uusi_attribuutti"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Anna uuden tilan nimi:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "uusi_malli"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Syötä aktiviteetti"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "uusi_toiminto"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Assosiaation väärä käyttätapa."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "uusi_literaali"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Assosiointivirhe"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "uusi_kenttä"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "uusi tila"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2459,11 +2513,6 @@ msgstr "Vi&e kuvana..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Vie k&aikki kaaviot kuvana..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Ominaisuudet"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Syväyssäätö"
@@ -2548,21 +2597,28 @@ msgstr "&Dokumentointi"
 msgid "Opening file..."
 msgstr "Avaa tiedostoa..."
 
+#: 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 "Luo uutta dokumenttia..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Kaikki tuetut tiedostot (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Kaikki tuetut tiedostot (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Pakkaamattomat XMI-tiedostot (*.xmi)\n"
 "*.xmi.tgz|Gzip-pakatut XMI-tiedostot (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2-pakatut XMI-tiedostot (*.xmi.tar.bz2)\n"
@@ -2592,6 +2648,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-pakattu XMI-tiedosto\n"
 "*|Kaikki tiedostot"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2600,6 +2660,10 @@ msgstr ""
 "Tiedosto %1 on jo olemassa.\n"
 "Haluatko korvata sen?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Korvaa"
@@ -2635,8 +2699,8 @@ msgstr "Liittää työpöydän sisältöä..."
 
 #: 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 ""
 "Umbrello ei pystynyt liittämään leikepöydän sisältöä. Leikepöydän oliot ovat "
 "epäsopivan tyyppisiä tähän."
@@ -2694,1252 +2758,1287 @@ msgstr "Kaikki tiedostot"
 msgid "Select Code to Import"
 msgstr "Valitse tuotava koodi"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Luokan &nimi:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Aktorin &nimi:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "uusi_attribuutti"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Paketin &nimi:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "uusi_malli"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Käyttötapauksen &nimi:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "uusi_toiminto"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Rajapinnan &nimi:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "uusi_literaali"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponentin &nimi:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "uusi_kenttä"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Jäänteen &nimi:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Umbrello UML mallintaja"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Luetellun tyypin &nimi"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Loogiset kaaviot"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Tietotyypin &nimi:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Käyttötapaukset"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entiteetin &nimi:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentit"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotyypin nimi:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Sijoittelunäkymä"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Paketin nimi:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entiteettien suhdemalli"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstrakti luokka"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tietotyypit"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstrakti käyttötapaus"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Käytetty mallinnus on muuttunut.\n"
+"Haluatko tallentaa sen?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "Suorit&ettava"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Tiedostoa %1 ei löytynyt."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Piirrä"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Tiedosto %1 näyttää vioittuneelta."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Oletus"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Pakatussa tiedostossa %1 ei ollut XMI-tiedostoa."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Kir&jasto"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Paketista avattua tiedostoa %1 ei pystytty lukemaan:"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Taulukko"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Tiedostoa %1 ei pystytty lukemaan"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "J&ulkinen"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Tiedoston %1 siirrossa (upload) tapahtui virhe"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&Yksityinen"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "käyttötapauskaavio"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "luokkakaavio"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "&Toteutus"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sekvenssikaavio"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Luokan nimi:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "yhteistyökaavio"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instanssin nimi:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "tilakaavio"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Piirrä aktorina"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "aktiviteettikaavio"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Monitoteutus"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponenttikaavio"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Näytä erillisinä"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "sijoittelukaavio"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponentin nimi:"
+#: umldoc.cpp:950
+#, fuzzy
+msgid "entity relationship diagram"
+msgstr "käsitekaavio"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Paketin nimi:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Tämä on epäkelpo nimi kaaviolle."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotyypin nimi:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Kaavio käyttää jo tätä nimeä."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Valitsemasi nimi\n"
-"on jo käytössä.\n"
-"Nimi on palautettu."
+"Antamasi nimi ei ole yksilöllinen.\n"
+"Tarkoititko tätä?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Nimi ei ole yksilöllinen"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Käyttönimi"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Rivi:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Anna uusi nimi"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Täyte:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Haluatko todella poistaa kaavion %1?"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Ol&etus"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Poista kaavio"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Käytä täytettä"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Alustaa dokumenttia..."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktiviteetit"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Selvittää objektin referenssit..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Uusi aktiviteetti..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Lataa UML-elementtejä..."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Vaihda nimeä"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Lataa diagrammeja..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Uusi aktiviteetti"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/automaattitallenna%1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Uudelleennimeä aktiviteetti"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Anna aktiviteetin uusi nimi:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Anna mallin nimi"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Assosiaation ominaisuudet"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Anna mallin uusi nimi:"
 
-#: 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 "Yleisasetukset"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Näkymät"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roolit"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Antamasi nimi on epäkelpo.\n"
+"Luontia ei ole tehty."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Roolin asetukset"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nimi on epäkelpo."
 
-#: 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 "Fonttiasetukset"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Antamasi nimi ei ollut yksilöllinen!\n"
+"Luonti on keskeytetty."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Assosiaation fontti"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Luonti keskeytetty"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Mallin ominaisuudet"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Lataa luettelonäkymää..."
 
-#: 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 "Yleisasetukset"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Kansio pitää olla tyhjä ennen poistamista."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tyyppi:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Kansio ei ole tyhjä"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nimi:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Uudelleennimeäminen keskeytetty"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Olet antanut epäkelvon mallin nimen."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Epäkelpo mallin nimi"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Toimintoa ei ole toteutettu"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Valitsemasi mallipohjan parametrin nimi on jo käytössä tässä toiminnossa."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Mallipohjan nimi ei ole yksilöllinen"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Entiteetin attribuutin ominaisuudet"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Oletusarvo"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Pituus/arvot:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automaattilisäys"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Salli &null"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attribuutit"
+"Antamasi nimi on epäkelpo.\n"
+"Uudelleennimeäminen on keskeytetty."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksointi"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Kaavio: %2 Sivu %1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Ei mikään"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Anna kaavion nimi"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Pää"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Anna kaavion uusi nimi:"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeksoi"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Olet poistamassa kaaviota.\n"
+"Oletko varma?"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Yksilöllinen"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Poista kaavio?"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Olet antanut epäkelvon attribuutin nimen."
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Vie näkymää..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Attribuutin arvo epäkelpo"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Kuvan viennissä tapahtui virhe:\n"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Valitsemasi attribuutin nimi on jo käytössä tässä toiminnossa."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Valittu tiedosto %1 on jo olemassa.\n"
+"Haluatko korvata sen?"
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Attribuutin nimi ei ole yksilöllinen"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Tiedosto on jo olemassa"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Näyttö"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Ei voitu luoda kansiota: %1"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Luokkanäytön asetukset"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ei voi tallettaa tyhjää kaaviota"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagrammin värit"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Tapahtui virhe talletettaessa kaaviota kohteeseen %1"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Antamasi nimi on epäkelpo."
+#: 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/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Antamasi nimi on jo käytössä."
+#: 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/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tyyppi:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekti"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrellon asetukset"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Tahdistettu viesti"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Käyttöliittymä"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Tahdistamaton viesti"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Käyttöliittymän asetukset"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Nimike"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Rivin väri:"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Viesti"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Ol&etusväri"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Laatikko"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Täyteväri:"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Suhde"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Oletus&väri"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Suunnattu assosiaatio"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Rivinpituus:"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Toteuttaa (Yleistys/Realisointi)"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Oletus&pituus"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Syvä historia"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "Käytä täyteväriä olet&uksena"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Matala historia"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Salli peruutukset"
+#: worktoolbar.cpp:277
+#, fuzzy
+msgid "Join"
+msgstr "Liity"
 
-#: dialogs/settingsdlg.cpp:112
+#: worktoolbar.cpp:278
 #, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "Käytä välilehtiä kaavioisssa"
+msgid "Fork"
+msgstr "Jaa"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Käytä uutta C++/Java/Ruby koodigeneraattoria"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Liitos"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Käytä kulmikkaita assosiaatioviivoja"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Valinta"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automaattinen talletus"
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "Tilasiirtymä"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Salli automaattin&en talletus"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Viesti"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Valitse automaattisen talletuksen talletusten aikaväli (minuutteja):"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "MÄÄRITTELEMÄTÖN"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Aseta automaattisen talletuksen tiedostopääte:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Valitse"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Aloitus"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Alkulogo"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "Päivän vihjee&t"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Lataa viimeiksitallennettu projekti"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Aloita uusi projekti:"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Näytä toiminnot"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Ei kaaviota"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Luokkakaavio"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Tyhjennä kaavio"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Käyttötapauskaavio"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sekvenssikaavio"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Yleistäminen"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Yhteistyökaavio"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Tilakaavio"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Aktiviteettikaavio"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Assosiaation nimi"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponenttikaavio"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Sijoittelukaavio"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Luokka-asetukset"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Näytä näky&vyys"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Oletus"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Näytä attribuutit"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Näytä toiminnot"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-slash (//)"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Näytä stereot&ypia"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-tähti (/**  */)"
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Näytä attribuutin allekirjoitus"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Tyyli:"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Näytä pakkaus"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ koodingenerointi</p>"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Oletusnäkyvyys"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Metodin koodipohjan luonti"
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Oletusnäkyvyys attribuutille:"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Käytä generoidussa koodissa seuraavaa luokille:"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Oletusnäkyvyys toiminnolle:"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Koodinluonti"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektori"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Koodinluonnin asetukset"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Muuttuja</b>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Koodin näytön asetukset"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Toimintojen ominaisuudet"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstrakti toiminto"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Luokkakohtainen &näkyvyys (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Kysely (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Suojattu"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Toteutus"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globaali?</i>"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametrit"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Uusi parametri..."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Luokan nimi"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Olet antanut epäkelvon parametrin nimen."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Sisällytettävä tiedosto</p></i>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parametrin nimi epäkelpo."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projektinluonti"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Antamasi parametrin nimi on jo\n"
-"käytössä tässä toiminnossa."
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Luo ANT build dokumentti (build.xml)"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parametrin nimi ei ole yksilöllinen"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Luo metodien koodipohjat automaattisesti"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Valitsemasi parametri on jo käytössä tässä toiminnossa."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Muodostimien koodipohjat"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Olet valinnut epäkelvon toiminnon."
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Accessor-metodien assosiointi"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Epäkelpo toiminnon nimi"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Attribuuttien aksessorimetodit"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
-"Toiminnolla on jo allekirjoitus %1:ssa.\n"
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Valitse toinen nimi tai parametrilista."
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Roolin A ominaisuudet"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Roolin B ominaisuudet"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Roolin A näkyvyys"
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Roolin B näkyvyys"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Attribuutin accessorin oletusnäkyvyys:"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Roolin A muunneltavuus"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Assosiaation oletusnäkyvyys:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Roolin B muunneltavuus"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Sisällytetyt osat"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java-koodin luonti</p>"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Uusi &attribuutti..."
-
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Uusi m&etodi..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Mallit"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby-koodin luonti</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Uusi &Malli..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Kieli"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Luetellun tyypin literaalit"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Kansiot"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Uusi lit&eraali"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Kirjoita luodut tiedostot kansioon:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entiteetin attribuutit"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Selaa..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "&Uusi attribuutti..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "S&elaa..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Aktiviteetin alkuasetus"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "S&isällytä header-tiedostoja kansiosta"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Koodingeneroinnissa tuotetut tiedostot tulevat tähän kansioon."
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Aktiviteetin tyyppi:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr "Tämän kansion tiedostot ovat header-tiedostoja koodin generoinnissa."
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Aktiviteetin nimi:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Tiedoston ylikirjoitussäännöt"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Elementtien värit"
+#: 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 ""
+"Jos koodingenerointi yrittää luoda samannimistä\n"
+"tiedostoa, joka on jo olemassa:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attribuutin ominaisuudet"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "K&orvaa"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Alkuarvo:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Ylikirjoita samannimiset nykyiset tiedostot kohdehakemistossa"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Kysy"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Olet antanut epäkelvon attribuutin nimen."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Jos samanniminen tiedosto on jo olemassa, kysy mitä tehdä"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attribuutin arvo epäkelpo"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Käytä m&uuta nimeä"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Valitsemasi attribuutin nimi on jo käytössä tässä toiminnossa."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Jos tiedosto on jo olemassa kohdekansiossa, valitse toinen nimi lisäämällä "
+"tiedostopääte nimeen."
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attribuutin nimi ei ole yksilöllinen"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Muotoilu"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Valitse toiminto"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Rivit"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sekvenssin numero:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Rivinvaihtomerkin tyyli:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Luokkatoiminto:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Sisennyksen tyyppi:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Oma toiminto:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Sisennyksen määrä:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammit"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Suodatin"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Käytössäoleva kaavio"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "K&aikki diagrammit"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Ei sisennystä"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "Valit&se kaaviot"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulointi"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "Diagrammin &tyyppi"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Tila"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Valinta"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Kommentin näkyvyys"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Yhteistyö"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Kirjoita kommentit jopa tyhjiin alueisiin"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvenssi"
+#: 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 ""
+"Kirjoittaa kommentit jopa tyhjiin luokan eri osiin (public, private jne)."
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Sijoittelu"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Kirjoita dokumentoinnin kommentit jopa tyhjänä"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Kaaviota ei ole valittu."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Kirjoittaa kommentit jopa &tyhjiin luokkiin ja metodeihin."
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Näyttöasetukset"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Kieliasetukset"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribuuttien asetukset"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Koodinluontivelho"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Metodien asetukset"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Valitse luokat"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Malliasetukset"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Sijoita kaikki luokat oikeanpuoleiseen listaan,\n"
+"joista haluat generoida koodin"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Lueteltujen literaalien asetukset"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Lisää luokka koodingenerointiin"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Attribuuttien asetukset"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Valitut luokat"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Sisältöasetukset"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Poista luokka koodinluonnista"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Assosiaatiot"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Käytettävissä olevat luokat"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Luokka-assosiaatiot"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Koodinluoonnin tila"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Toimi&nnot"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Paina Luo-nappia aloittaaksesi koodinluonnin"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "Näky&vyys"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Luonnin tila"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "&Metodin allekirjoitus"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Näytä piilotetut lohkot"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&kkaus"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">komponentin nimi tähän</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ribuutit"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&yyppi"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Näytä lohkon tyyppi"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibuutin allekirjoitus"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Värit"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Piirrä ympyränä"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Fontti:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Alkutila"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Tausta:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Lopputila"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Valittu:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tilan tyyppi:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML objektin lohko:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Tilan nimi:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Piilotettu lohko:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Elementin väri"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Editoimaton teksti:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "uusi_luokka"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Editoitava teksti:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Uusi luokka"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Kaavion ominaisuudet"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Luokan attribuutit"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zoom:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Luokan metodit"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parametrin ominaisuudet"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Näytä &hila"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Välityssuunta"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Sovi&ta hilaan"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Sovita komponentin koko"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
+"Napsauta komponentin kokoa kasvattaaksesi kokoa hilassa.\n"
+"Jos hilaan sovittaminen on asetettu, kaikki 4 sivua sovitetaan hilaan."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Luo"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Hilan välit:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Lopetus"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Koodinluonti"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ei ole luotu"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Rivinpituus:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ei ole vielä luotu"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Vie kaikki näkymät"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Kansiota %1 ei ole. Haluatko luoda sen nyt?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Kansio, jonne kaaviot talletetaan:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Tuloskansiota ei ole"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Peruskansio, jonne kuvat talletetaan"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Luo kansio"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Kuvan tyypp&i:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Älä luo"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Käytä &kansioita"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Kansiota ei voitu luoda.\n"
-"Tarkista kirjoitusoikeudet ylemmän tason kansioon tai valitse toinen "
-"kelvollinen kansio."
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Virhe kansion luonnissa"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Ole hyvä ja valitse kelvollinen kansio."
-
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Kohdekansio on olemassa, mutta ei kirjoitettavana.\n"
-"Aseta sen kirjoitusoikeudet tai valitse toinen kansio."
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Virhe kohdekansioon kirjoituksessa"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 ei näytä kansiolta. Ole hyvä ja valitse kelvollinen kansio."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Roolin muutettavuus"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Ole hyvä ja valitse kelvollinen kansio"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Roolin näkyvyys"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Kohdetiedosto on jo olemassa"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "Vi&e"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Tiedosto %1 on jo olemassa kansiossa %2.\n"
-"\n"
-"Umbrello voi ylikirjoittaa tiedoston, luoda samanlaisen\n"
-"tai ei luoda samanlaista tiedostoa."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "Tee k&aikille jäljelläoleville tiedostoille"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Ylikirjoita"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Luo samanlainen tiedostonnimi"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Ä&lä luo tiedostoa"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Ei optioita saatavilla.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Kerroin"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Anna lukumäärä:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Assosiaation nimi"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Anna assosiaation nimi:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Roolin nimi"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Anna roolin nimi:"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Anna metodin nimi:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Anna uusi teksti:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "VIRHE"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Vaihda teksti"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Asettelu vasemmalle"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Asettelu oikealle"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagrammi"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Asettelu ylös"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Uusi"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Asettelu alas"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Näy&tä"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Asettelu pystysuunnassa keskelle"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zoom:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Asettelu vaakatasossa keskelle"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Koodi"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Asettelu pystysuunnassa keskelle"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktiivinen kie&li"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Asettelu vaakatasossa keskelle"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Kohdistukseen on valittava vähintään 2 kohdetta kuten luokkia tai aktoreita. Et "
-"voi kohdistaa assosiaatioita."
+"<p>Tervetuloa Umbrelloon.</p>\n"
+"<p>UML mallit auttavat suunnittelemaan ja dokumentoimaan "
+"objektiorientoituneita ohjelmia.  <a href=\"help:/umbrello\">Umbrellon "
+"käsikirja</a> on hyvä johdatus UML:n käyttöön.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Tämä on koodigeneraattorin varattu sana."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Varattu sana"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Vie näkymää..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Tervetuloa Umbrello 1.5 -oohjelmaan.  Tässä versiossa on uutta "
+"assosiaatioluokat, Ruby koodin kehitys, kansioiden ulkoistus, kyky vaihtaa "
+"rajapinnat luokiksi, ja muuta.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Kuvan viennissä tapahtui virhe:\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Valittu tiedosto %1 on jo olemassa.\n"
-"Haluatko korvata sen?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Tiedosto on jo olemassa"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "uusi_aktori"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "uusi_käyttötapaus"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "uusi_pakkaus"
+"<p>Suurinta osaa kaavioiden kappaleiden kokoa ei voi muuttaa. Ne "
+"skaalautuvat automaattisesti niille varattuun tilaan.\n"
+"Laatikkojen, muistioiden ja sekvenssikaavioiden viestien kokoa voi muuttaa "
+"klikkaamalla niitä ja vetämällä hiirellä punaisesta neliöstä.</p>\n"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "uusi_komponentti"
+#: 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 ""
+"<p>Jos haluat lisätä kaavioon jo olemassaolevan luokan, siirrä (drag+drop) "
+"se hiirellä puunäytöstä.</p>\n"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "uusi_paketti"
+#: 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 ""
+"<p>Umbrellon uusi refactoring agentilla voit siirtää toimintoja johdettujen "
+"ja kantaluokkien välillä\n"
+"Refactoring agent avautuu luoksta hiiren oikeanpuoleisella napilla.</p>\n"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: 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 ""
+"<p>Sekvenssikaavioiden olioilla voi olla hajoitinlaatikko ja ne voidaan "
+"piirtää aktoreina.  Kaksoisklikkaa yhtä ominaisuusdialogin esillesaamiseksi."
+"</p>\n"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "uusi_käyttöliittymä"
+#: 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 ""
+"<p>Sekvenssikaavioiden viestit voivat toimia muodostimina. Klikkaa "
+"kohdelaatikkoa (mieluummin kuin viivaa) tehdäksesi sille muodostimen.</p>\n"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "uusi_tietotyyppi"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "uusi_lueteltu_tyyppi"
+#: 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 ""
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "uusi_entiteetti"
+#: 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 ""
+"<p>Leikkaa ja kopioi vie kuvan PNG-leikepöydälle. Sen voi liittää\n"
+"KWordiin ja toisiin sovelluksiin.</p>\n"
 
-#: model_utils.cpp:264
+#: tips:78
 #, fuzzy
-msgid "new_folder"
-msgstr "uusi_paketti"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "uusi_objekti"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Tyhjä"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Huonostimuotoiltu argumentti"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tuntematon argumentin tyyppi"
-
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Epäkelpo metodinnimi"
-
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tuntematon paluuarvon tyyppi"
-
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Määrittelemätön virhe"
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Lisää yliluokka"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Lisää aliluokka"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Lisää metodi"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Lisää attribuutti"
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+"<p>Assosiaatioiden ei tarvitse olla suoria. Assosiaation kaksoisklikkaus luo "
+"siirreltävän pisteen.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-#, fuzzy
-msgid "Add Base Interface"
-msgstr "Lisää peruskäyttöliittymä"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Voit asettaa automaattitallennuksen Muokkaa Umbrellon asetuksia valikossa."
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Lisää perivä käyttöliittymä"
+#: 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 ""
+"<p>Puuttuuko Umbrellosta jokin ominaisuus? Kerro siitä meille. \n"
+"Voit vaihtoehtoisesti lisätä bugin bugitietokantaan Ilmoita virheestä -"
+"toiminnolla Help-valikossa.\n"
+"Voit lähettää bugiraportin myös uml-devel postituslistalle.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Yliluokat"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Voit poistaa kaikki valitut objektit painamalla Del tai Backspace -"
+"näppäintä.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Aliluokat"
+#: 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 ""
+"<p>Jos olet löytänyt bugin Umbrellosta, kerro siitä meille.\n"
+"Voit lähettää ilmoituksen Ilmoita virheestä -työkalulla Help-valikossa.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Ei voitu luoda kansiota: %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 ""
+"<p>Esc-näppäimen painallus asettaa nykyisen työkalun käyttöön.\n"
+"Backspace ottaa käyttöön aiemmin käytetyn työkalun.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Ei voi tallettaa tyhjää kaaviota"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Voit valita objektin painamalla Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Tapahtui virhe talletettaessa kaaviota kohteeseen %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 ""
+"<p>Voit luoda ja asettaa uuden luokan käyttämällä Code-menun uuden luokan "
+"luontivelhoa.</p>\n"
diff --git a/tde-i18n-fr/messages/tdesdk/umbrello.po b/tde-i18n-fr/messages/tdesdk/umbrello.po
index 5daa96b1ff8..0491c9fd993 100644
--- a/tde-i18n-fr/messages/tdesdk/umbrello.po
+++ b/tde-i18n-fr/messages/tdesdk/umbrello.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-10-09 22:59+0200\n"
 "Last-Translator: Nicolas Ternisien <nicolas.ternisien@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -23,249 +23,209 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Générateur de code autonome d'Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Fichier à transformer"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Le fichier XSLT à utiliser"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (alias Kleag), (c) 2002-2006 Les auteurs du modeleur "
-"UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "L'équipe de développement d'Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Caulier Gilles,Simon Depiets,Nicolas Ternisien"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Exportation de toutes les vues..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "caulier.gilles@free.fr,2df@tuxfamily.org,nicolas.ternisien@gmail.com"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Des erreurs se sont produites lors de l'exportation des images :"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Saisir le nom de l'activité"
 
-#: 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 "Une erreur est apparue lors de l'enregistrement du fichier « %1 »"
+#: 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 "Saisir le nom de la nouvelle activité :"
 
-#: 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 "Erreur lors de l'enregistrement"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Aligner à gauche"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objet"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Aligner à droite"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Message synchrone"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Aligner en haut"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Message asynchrone"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Aligner en bas"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Association"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Aligner au milieu verticalement"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Contenu"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Aligner au milieu horizontalement"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ancrage de note"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Aligner verticalement de façon distribuée"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Libellé"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Aligner horizontalement de façon distribuée"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Note"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Pour l'alignement vous devez sélectionner au moins deux objets comme les "
+"classes ou acteurs. Vous ne pouvez pas aligner des associations."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Boîte"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Mise en forme"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Acteur"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dépendance"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Généralisation"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agrégation"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relation"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Association directionnelle"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Hiérarchie"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composition"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Cas d'utilisation"
-
-#. 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 "Classe"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Début de scénario"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Fin de scénario"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Branchement conditionnel"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Synchronisation"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paquetage"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Composant"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nœud"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dépendance"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Objet composite"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Association"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interface"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Association automatique"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Type de données"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Message de collaboration"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Énumération"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Message de séquence"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entité"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Message de collaboration automatique"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Historique complet"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Message de séquence automatique"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Historique bref"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Contenu"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Jointure"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composition"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Séparation"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Réalisation"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Jonction"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Association unidirectionnelle"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Choix"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ancrage de note"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Transition"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Transition d'activité"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Activité"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "État"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Cardinalité"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Fin"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Saisir la cardinalité :"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Départ"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nom de l'association"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Message"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Saisissez le nom de l'association :"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "Non défini"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nom du rôle"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Sélectionner"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Saisir le nom du rôle :"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Une opération avec les mêmes signature et nom existe déjà. Vous ne pouvez "
+"pas l'ajouter de nouveau."
+
+#: 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 "C'est un nom incorrect."
+
+#: 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 "Nom incorrect"
+
+#: 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 "Ce nom est déjà utilisé."
+
+#: 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 "Nom non unique"
 
 #: 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."
+"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 ""
-"Impossible de coller au moins un des éléments contenus dans le presse-papiers "
-"car un élément avec le même nom existe déjà. Les autres éléments ont cependant "
-"été collés."
+"Impossible de coller au moins un des éléments contenus dans le presse-"
+"papiers car un élément avec le même nom existe déjà. Les autres éléments ont "
+"cependant été collés."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -276,18 +236,17 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Impossible d'ouvrir le fichier « %1 » en écriture. Veuillez vous assurer que le "
-"dossier existe et que vous avez les droits d'accès en écriture sur ce dossier."
+"Impossible d'ouvrir le fichier « %1 » en écriture. Veuillez vous assurer que "
+"le dossier existe et que vous avez les droits d'accès en écriture sur ce "
+"dossier."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Impossible d'ouvrir le fichier"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Impossible de créer le dossier :\n"
+msgid "Cannot create the folder:\n"
+msgstr "Impossible de créer le dossier :\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -301,1371 +260,1529 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Impossible de créer le dossier"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Saisir le nom de l'état"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Options générales"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Saisir le nom du nouvel état :"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Le paquetage est un espace de noms"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Saisir le nom de l'activité"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Destructeurs virtuels"
 
-#: 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 "Saisir le nom de la nouvelle activité :"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Générer des constructeurs vides"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nouvelle activité"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Génération des méthodes d'accès"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Modèle UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Les opérations sont incorporées au texte"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Vue logique"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Les accesseurs sont incorporés au texte"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Vue des cas d'utilisation"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Les accesseurs sont publics"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Composants"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importation du fichier : %1. Progression : %2 / %3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Déploiements"
+#: 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 "Prêt."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Modèle de relations entre entités"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "La portée %1 est-elle un espace de noms ou une classe ?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Types de données"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "L'importation C++ a besoin de votre aide"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Le fichier courant a été modifié.\n"
-"Voulez-vous l'enregistrer ?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Espace de noms"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Le fichier « %1 » n'existe pas."
+#: 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 "Classe"
 
-#: 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 "Erreur lors du chargement"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Erreur interne"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Le fichier %1 semble avoir été corrompu"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Erreur de syntaxe avant « %1 »"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Il n'y a pas de fichier XMI trouvé dans le fichier compacté %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Erreur de syntaxe avant « %1 »"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Une erreur est apparue lors du chargement du fichier extrait: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Une erreur est apparue lors du chargement du fichier « %1 »"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "expression attendue"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Une erreur est apparue lors du téléchargement du fichier « %1 »"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Erreur de syntaxe de déclaration"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagramme de cas d'utilisations"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} attendu"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagramme de classes"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace attendu"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagramme de séquences"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ attendu"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagramme de collaborations"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Nom de namespace attendu"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagramme d'états"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "A besoin d'un spécificateur de type pour déclarer"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagramme d'activités"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "déclaration attendue"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagramme de composants"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Expression constante attendue"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagramme de déploiements"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "« ) » attendue"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagramme de relations entre entités"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} manquante"
 
-#: 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 "Nom"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Initialiseurs de membres attendus"
 
-#: 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 "Saisir un nom :"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Spécificateur de la classe de base attendu"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "C'est un nom incorrect pour un diagramme."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Clause d'initialisation attendue"
 
-#: 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 "Nom incorrect"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identifier attendu"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Un diagramme utilise déjà ce nom."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Id de type attendu"
 
-#: 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 "Nom non unique"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Nom de classe attendu"
 
-#: 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 "C'est un nom incorrect."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "condition attendue"
 
-#: 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 "Ce nom est déjà utilisé."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "état attendu"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Le nom du paramètre que vous avez saisi n'est pas unique.\n"
-"Est-ce que c'était ce que vous vouliez ?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "initialisation du for attendue"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Le nom n'est pas unique"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch attendu"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Nom à utiliser"
+#: 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 "&Propriétés"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Saisissez le nouveau nom"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Départ"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Confirmez-vous la suppression du diagramme « %1 » ?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Fin"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Supprimer le diagramme"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Branchement conditionnel"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Paramétrage du document..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Synchronisation"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Résolution des références des objets..."
+#: 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 "Général"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Chargement des éléments UML..."
+#: 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 "Propriétés générales"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Chargement des diagrammes..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Type d'activité :"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Diagramme UML pour TDE"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nom de l'activité :"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/EnregistrementAuto%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 "Documentation"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Externaliser le dossier"
+#: 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 "Police de caractères :"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Saisissez le nom du modèle"
+#: 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 "Paramétrages de la police de caractères"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Saisissez le nouveau nom du modèle :"
+#: 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 "Couleurs"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vues"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Couleurs de l'élément graphique"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Le nom que vous avez saisi était incorrect.\n"
-"Le processus de création a été annulé."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Activités"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nom incorrect"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nouvelle activité..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Le nom que vous avez saisi n'est pas unique !\n"
-"Le processus de création sera annulé."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Supprimer l'ancrage de note"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Création annulée"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Renommer"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Chargement de la liste d'affichage..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nouvelle activité"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Le dossier doit être vide avant d'être supprimé."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nouvelle activité"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Dossier non vide"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Renommer l'activité"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Une opération avec les mêmes signature et nom existe déjà. Vous ne pouvez pas "
-"l'ajouter de nouveau."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Saisir le nouveau nom de l'activité :"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Saisir le nom de l'activité"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nom :"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nouvel_état"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type :"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Généralisation"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associations"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Association automatique"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Propriétés de l'association"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Message de collaboration"
+#: 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 "Configurations générales"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Message de séquence"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Rôles"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Message de collaboration automatique"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Paramétrages des rôles"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Message de séquence automatique"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Police de caractères pour les associations"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Réalisation"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Propriétés de la classe A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Association unidirectionnelle"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Propriétés de la classe B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exporter"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Visibilité du rôle de la classe A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagramme"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Visibilité du rôle de la classe B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nouveau"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Propriété du rôle de la classe A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Aff&icher"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Propriété du rôle de la classe B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "C&ode source"
+msgid "Rolename:"
+msgstr "Rôle :"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Langage de programmation courant"
+msgid "Multiplicity:"
+msgstr "Cardinalité :"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentation"
+msgid "Public"
+msgstr "Publique"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Slash-Slash (//)"
+msgid "Private"
+msgstr "Privée"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Slash-Étoile (/**  */)"
+msgid "Protected"
+msgstr "Protégée"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Style :"
+msgid "Implementation"
+msgstr "Implantation"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Génération de code C++</p>"
+msgid "Changeable"
+msgstr "Modifiable"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Général"
+msgid "Frozen"
+msgstr "Non modifiable"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Génération du corps de la méthode"
+msgid "Add only"
+msgstr "Ajouter seulement"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Utiliser ceci pour les classes dans code généré :"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nom de la classe :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nom de l'acteur :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vecteur"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nom du paquetage :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nom du cas d'utilisation :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nom de l'interface :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nom du composant :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nom de l'objet composite :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Chaîne</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Nom de l'é&numération :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Liste</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nom du type de données :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nom de l'entité :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global ?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Nom du &stéréotype :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Nom du &paquetage :"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nom de la classe"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Classe d'a&bstraction"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Fichier en-tête</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Cas d'utilisation a&bstrait"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Génération du projet"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Exécutable"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Créer un fichier de construction pour le programme « Ant »"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Représentation graphique"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Générer automatiquement les méthodes"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Par &défaut"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Méthodes des constructeurs vides"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Remp&lissage :"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Méthodes d'accès à l'association"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&liothèque"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Méthodes d'accès à l'attribut"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Table"
 
-#. 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 "Publique"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibilité"
 
-#. 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 "Privée"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublique"
 
-#. 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 "Protégée"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivé"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Depuis l'objet parent"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tégé"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Portée de l'attribut par défaut :"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "I&mplantation"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Portée de l'opération par défaut :"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nom de la classe :"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Depuis le rôle parent"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nom de l'instance :"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Génération de code Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Dessiner comme un acteur"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Dièse (« # »)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Collection d'instances"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Début-fin (=degin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Afficher la marque de destruction"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Génération de code Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nom du composant :"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nom du noeud :"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nom du stéréotype :"
+
+#: 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 ""
+"Le nom que vous avez choisi\n"
+"est déjà utilisé.\n"
+"Le nom sera effacé."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Nom non unique"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attributs"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Nouv&el attribut..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Opérations"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nouv&elle opération..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Classes paramétrables"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Nouv&elle classe paramétrable..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Énumérations littérales"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Nouv&elle énumération littérale..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Attributs de l'entité"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Nouv&el attribut pour l'entité..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Supprimer l'ancrage de note"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Propriétés"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Afficher"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Opératio&ns"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibilité"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&pération de la signature"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&quetage"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributs"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stéréot&ype"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibut de la signature"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Dessiner comme un cercle"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Affichage"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Options d'affichage"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Paramètres de l'attribut"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Paramètres de l'opération"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Paramètres des classes paramétrables"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Paramètres pour les énumérations littérales"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Paramètres des attributs de l'entité"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Contenu"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Paramètres des contenus"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Classe d'associations"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nouvelle_classe"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nouvelle classe"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Attributs de la classe"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Opérations de la classe"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Options pour la génération du code source"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Langage"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Générer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Dossiers"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Terminer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Écrire tous les fichiers générés dans le dossier :"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Code généré"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Parcourir..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Non généré"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Pa&rcourir..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Pas encore généré"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Inclure les fichiers d'en-tête du dossier :"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Le dossier « %1 » n'existe pas. Voulez-vous le créer maintenant ?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Les fichiers créés par le processus de génération du code source seront écrits "
-"dans ce dossier"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Le dossier de destination n'existe pas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Créer un dossier"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ne pas créer"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Les fichiers de ce dossier seront utilisés comme fichiers d'en-tête lors de la "
-"génération du code source"
+"Impossible de créer le dossier.\n"
+"Veuillez vous assurer que vous avez les droits en écriture sur le dossier "
+"parent, ou en sélectionnez un autre valable."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Politique d'écrasement des fichiers"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Erreur lors de la création du dossier"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Veuillez sélectionner un dossier valable."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Si un fichier a le même nom que celui qui est\n"
-"généré avec le code source :"
+"Le dossier de destination existe, mais il est impossible d'y écrire.\n"
+"Veuillez définir ses droits en écriture ou en choisir un autre."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Écra&ser"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Erreur d'écriture dans le dossier de destination"
 
-#. 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/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
-"Écraser le fichier existant si celui ci existe déjà dans le dossier de "
-"destination"
+"« %1 » ne semble pas être un dossier. Veuillez sélectionner un dossier "
+"correct."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Deman&der confirmation"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Veuillez choisir un dossier correct"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Demander confirmation si un fichier avec le même nom existe déjà avant de "
-"l'écraser"
+msgid "Code Viewer"
+msgstr "Visualisateur de code source"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Utiliser un nom différent"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Aucune option disponible.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Si un fichier existe déjà dans le dossier de destination, sélectionne un nom "
-"différent en ajoutant un suffixe au nom du fichier"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammes"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Mise en forme"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtre"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Lignes"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Diagramme &courant"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Style de fin de ligne :"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Tous les di&agrammes"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Type d'indentation :"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Sélectionner les diagrammes"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Indentation en amont :"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Type de diagramme"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\n"
-"\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Sélection"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\n"
-"\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Cas d'utilisation"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Collaboration"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Aucune indentation"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Séquence"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Déplacer"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "État"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Espace"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Composant"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Verbosité des commentaires"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Déploiement"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Diagramme UML pour TDE"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Aucun diagramme n'a été sélectionné."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Le format dans lequel l'image sera exportée"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Note de documentation"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Le fichier de destination existe déjà"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Écrire des com&mentaires pour les sections, même\n"
-"si elles sont vides"
+"Le fichier de destination « %1 » existe déjà dans « %2 ».\n"
+"\n"
+"Umbrello peut écraser le fichier, générer un nom de fichier similaire\n"
+"ou ne pas générer ce fichier."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Appliquer à tous les fichiers restants"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Écra&ser"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Générer un nom de fichier similaire"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Ne pas générer de fichier"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Propriétés des paramètres"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Type :"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nom :"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Valeur &initiale :"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Direction de passage"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Écrire des commentaires pour indiquer les différentes sections (publique, "
-"privée, etc) dans une classe, même si ces sections sont vides"
+"« in » est un paramètre de lecture seule, « out » est un paramètre "
+"d'écriture seule et « inout » est un paramètre de lecture / écriture."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Écrire des commentaires même si les documentations sont &vides"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Éléments contenus"
 
-#. 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/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Sélectionner l'opération"
+
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Séquence numéro :"
+
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Opération de la classe :"
+
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Opération personnalisée :"
+
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Configuration d'Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interface utilisateur"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Paramètres de l'interface utilisateur"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Couleur des lignes :"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Coul&eur par défaut"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Couleur de remplissage :"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Coul&eur par défaut"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Largeur de la ligne :"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "&Largeur par défaut"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Utiliser la couleur de remplissage"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Écrire des commentaires pour les classes et les mét&hodes dont les "
-"documentations sont vides"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Options pour les langages de programmation"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Activer l'annulation"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Assistant de génération du code source"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Utiliser les diagrammes en onglets"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Sélectionner les classes"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Utiliser les nouveaux générateurs C++ / Java / Ruby"
 
-#. 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:120
+msgid "Use angular association lines"
+msgstr "Utiliser des lignes d'association angulaires"
+
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Enregistrement automatique"
+
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Activer l'e&nregistrement automatique"
+
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
 msgstr ""
-"Placer toutes les classes dont vous voulez générer le code source\n"
-"dans la liste latérale de droite"
+"Sélectionner l'intervalle pour l'enregistrement automatique (minutes) :"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Ajouter une classe pour la génération du code source"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Suffixe d'enregistrement automatique:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Classes sélectionnées"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Si l'enregistrement automatique se produit avant que vous n'ayez "
+"enregistré manuellement le fichier, il se fera dans le fichier ~/autosave."
+"xml.</p> <p>Dans le cas contraire, l'enregistrement automatique se fera dans "
+"le même dossier que le document et sous le même nom de fichier, suivi du "
+"suffixe choisi.</p> <p>Si le suffixe est identique au suffixe du fichier que "
+"vous avez enregistré, l'enregistrement automatique écrasera automatiquement "
+"votre fichier.</p></qt>"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Supprimer une classe pour la génération du code source"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Démarrage"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Classes disponibles"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logo de déma&rrage"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "État de la génération du code source"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "As&tuce du jour"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Appuyer sur le bouton « Générer » pour démarrer la génération de code"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Charger &le dernier projet"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Générer les états"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Démarrer un nouveau projet avec :"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Visualisateur de code source"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Aucun diagramme"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Afficher les blocs cachés"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagramme de classes"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">le nom du composant logiciel ici</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagramme de cas d'utilisation"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Afficher les types de blocs"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagramme de séquences"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Couleurs"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagramme de collaborations"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Police de caractères :"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagramme d'état"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papier :"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagramme d'activités"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Sélection :"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagramme de composants"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Bloc objet UML :</p>"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagramme de déploiements"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Bloc caché :</p>"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Paramétrages des classes"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Texte non modifiable :</p>"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Afficher la &visibilité"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Texte modifiable :</p>"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Afficher les attributs"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Propriétés du diagramme"
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Afficher les opérations"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nom :"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Afficher le stéréot&ype"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zoom :"
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Afficher l'attribut de la signature"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Afficher le paquetage"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Afficher l'opération de la signature"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Afficher le quadrilla&ge"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Début de la portée"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Placer les élémen&ts sur le quadrillage"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Portée de l'attribut par défaut :"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Adapter la taille du composant"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Portée de l'opération par défaut :"
 
-#. 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."
-msgstr ""
-"Adapte la taille des composants à un multiple de la valeur d'espacement qui est "
-"utilisé pour le quadrillage.\n"
-"Si l'option « Placer les composants sur le quadrillage » est activée, un "
-"composant sera toujours aligné avec le quadrillage en utilisant quatre unités "
-"d'espacement."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Génération du code source"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Espacement du quadrillage:"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Paramètres pour la génération du code source"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Paramètres pour le visualisateur de code source"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Début de scénario"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Largeur de la ligne :"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Fin de scénario"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exporter toutes les vues"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Type d'état :"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Dossier dans lequel enregistrer les diagrammes :"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nom de l'état :"
 
-#. 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"
-msgstr "Le dossier de base utilisé pour enregistrer les images"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Couleur de l'élément graphique"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Type d'&image :"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Propriétés de l'attribut"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Le format dans lequel l'image sera exportée"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Classe &statique (« static »)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Utiliser des &dossiers"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Publique"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Créer dans le dossier cible l'arborescence utilisée dans\n"
-"le document pour conserver les vues"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Protégé&e"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplantation"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Vous avez saisi un nom d'attribut non valable."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nom d'attribut non valable"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"Les vues sont conservées dans des dossiers dans le document. L'arborescence "
-"utilisée dans le document pour conserver les vues peut être créée dans le "
-"dossier de base choisi, grâce à cette option.\n"
-"Seuls les dossiers locaux créés par l'utilisateur sont créés dans le dossier de "
-"base (vue logique, les autres ne sont pas créées)."
+"Le nom de l'attribut que vous avez choisi est déjà utilisé dans cette "
+"opération."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Propriétés du rôle"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Le nom de l'attribut n'est pas unique"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rôle :"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Propriétés de l'attribut de l'entité"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Cardinalité :"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Valeur par &défaut :"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Propriété du rôle de la classe B"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Longueur / Valeurs :"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Ajouter seulement"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto incrémentation"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Non modifiable"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Autoriser la valeur « &null »"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Modifiable"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributs :"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Visibilité du rôle"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexation"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implantation"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Aucun"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Bienvenue sur Umbrello.</p>\n"
-"<p>Les diagrammes UML vous permettent de concevoir et documenter des logiciels "
-"basés sur un modèle objet. <a href=\"help:/umbrello\">"
-"Le manuel d'utilisation d'Umbrello</a> est une bonne introduction sur "
-"l'utilisation d'UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primaire"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Bienvenue sur Umbrello 1.5. Les nouveautés de cette version sont les classes "
-"d'associations, la génération de code Ruby, les dossiers externalisables, la "
-"capacité de modifier les interfaces en classes et bien plus encore.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Les diagrammes en onglets et les dossiers externalisables sont mutuellement "
-"exclusifs. Si vous utilisez les dossiers externes, veuillez désélectionner "
-"l'option « Utiliser les diagrammes en onglets » dans les préférences "
-"générales.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unique"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>La plupart des diagrammes ne peuvent pas être redimensionnés, mais seront "
-"automatiquement redimensionnés en fonction de leur contenu.\n"
-"Les boîtes, les notes, et les messages de diagrammes de séquences peuvent\n"
-"être redimensionnés en cliquant et en tirant sur le bord de couleur rouge.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Vous avez saisi un nom d'attribut d'entité non valable."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Si vous voulez ajouter une classe déjà existante dans un diagramme, glissez "
-"et déposez-le sur l'entrée de la vue en arborescence correspondante au "
-"diagramme.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nom d'attribut d'entité non valable"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Le nouvel agent de reconstruction d'Umbrello vous permet de déplacer des "
-"opérations entre une classe et ses dérivés et les classes de base.\n"
-"Faites un clic droit sur une classe pour ouvrir l'agent de reconstruction.</p>\n"
+"Le nom de l'attribut de l'entité que vous avez choisi est déjà utilisé dans "
+"cette opération."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Les objets d'un diagramme de séquences peuvent disposer d'une marque de "
-"destruction et peuvent être dessinés comme des acteurs.\n"
-"Double cliquez sur celui-ci pour afficher la boîte de dialogue de paramétrage "
-"des propriétés de l'objet.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Le nom de l'attribut de l'entité n'est pas unique"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Les messages du diagramme de séquence peuvent jouer le rôle de "
-"constructeurs. Cliquez sur la boîte de l'objet (plutôt que sur la ligne "
-"verticale) pour le transformer en constructeur.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Propriétés de l'opération"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Les messages des diagrammes de séquence peuvent être reliés à eux-mêmes. "
-"Recliquez sur la même ligne verticale pour créer un message automatique.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Opér&ation d'abstraction"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Si lors du chargement d'un fichier distant rien ne s'affiche sur la liste, "
-"essayez d'enregistrer le modèle sous un nom différent, puis le fermer et "
-"recharger le fichier enregistré. La liste est alors remplie correctement.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "Re&quête (« const »)"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Le copier / coller pourra exporter une sélection dans un diagramme vers une "
-"image au\n"
-"format PNG pour pouvoir l'utiliser dans une autre application comme KWord.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Paramètres"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Les associations ne sont pas obligatoirement en lignes droites. En double "
-"cliquant sur l'une d'entre elles, vous créez un point de cassure mobile.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Nouvea&u paramètre..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Vous pouvez activer l'enregistrement automatique dans la boîte de dialogue "
-"de configuration d'Umbrello.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Vous avez saisi un nom de paramètre non valable."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Une fonctionnalité est manquante dans Umbrello ? Veuillez nous contacter "
-"pour nous faire part de vos besoins et de vos souhaits en écrivant un rapport "
-"de bogue, ou en envoyant un courrier électronique sur la liste de diffusion "
-"« uml-devel ».</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nom de paramètre non valable"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Vous pouvez supprimer tous les objets en utilisant les touches « Suppr » ou "
-"« Backspace ».</p>\n"
+"Le nom du paramètre que vous avez choisi\n"
+"est déjà utilisé dans cette opération."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Si vous avez trouvé un bogue dans Umbrello, veuillez nous contacter.\n"
-"Vous pouvez soumettre des rapports de bogues en utilisant l'option « Rapport de "
-"bogue » disponible dans le menu « Aide ».</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Le nom du paramètre n'est pas unique"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Une pression sur la touche Échap sélectionne l'outil courant.\n"
-"Une pression sur la touche Correction (Backspace) retourne à l'outil "
-"précédemment utilisé.</p>\n"
+"Le nom du paramètre que vous avez choisi est déjà utilisé dans cette "
+"opération."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Vous avez saisi un nom d'opération non valable."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nom d'opération non valable"
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Une opération avec cette signature existe déjà dans « %1 ».\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Choisissez un nom ou une liste de paramètres différente."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Propriétés du rôle"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Propriétés de la classe paramétrable"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Vous avez saisi un nom de classe paramétrable non valable."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nom de classe paramétrable incorrect"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Vous pouvez sélectionner tous les objets en utilisant les touches "
-"« Ctrl-A ».</p>\n"
+"Le nom du paramètre du modèle que vous avez choisi est déjà utilisé dans "
+"cette opération."
 
-#: tips.txt:108
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Le nom du modèle n'est pas unique"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Options d'affichage des classes"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Couleurs du diagramme"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Le nom que vous avez saisi est incorrect."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Le nom que vous avez saisi n'est pas unique."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Le nom n'est pas unique"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Ligne :"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Remp&lissage :"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Par dé&faut"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Utiliser la couleur de remplissage"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Exportation de toutes les vues..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Des erreurs se sont produites lors de l'exportation des images :"
+
+#: 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 "Une erreur est apparue lors de l'enregistrement du fichier « %1 »"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Erreur lors de l'enregistrement"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Générateur de code autonome d'Umbrello"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Fichier à transformer"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Le fichier XSLT à utiliser"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Vous pouvez créer et paramétrer une nouvelle classe en utilisant l'assistant "
-"de création d'une nouvelle classe disponible dans le menu « Code source ».</p>\n"
+"(c) 2006 Gael de Chalendar (alias Kleag), (c) 2002-2006 Les auteurs du "
+"modeleur UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "L'équipe de développement d'Umbrello"
+
+#: 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 "Nom"
+
+#: 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 "Saisir un nom :"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Donnez le nom de l'opération :"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Saisir le nouveau texte :"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERREUR"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Modifier le texte"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Le dossier « %1 » n'existe pas."
+
+#: 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 "Erreur lors du chargement"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Impossible d'ouvrir le dossier « %1 »."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1719,6 +1836,10 @@ msgstr "Nouvelle opération..."
 msgid "Select Operation..."
 msgstr "Sélection d'une opération..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Changer le texte..."
@@ -1770,6 +1891,19 @@ msgstr "Nouveau"
 msgid "Rename..."
 msgstr "Renommer..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Erreur lors du collage du presse-papiers"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Couleur des lignes..."
@@ -1798,14 +1932,26 @@ msgstr "Placer le dossier en interne"
 msgid "Import Classes..."
 msgstr "Importer des classes..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paquetage"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Sous-système"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Objet composite"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagramme de composants..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nœud"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagramme de déploiements..."
@@ -1814,10 +1960,18 @@ msgstr "Diagramme de déploiements..."
 msgid "Folder"
 msgstr "Dossier"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entité"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagramme de relations entre entités..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Acteur"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagramme de cas d'utilisation..."
@@ -1854,6 +2008,18 @@ msgstr "Nouvel attribut d'entité..."
 msgid "Export as Picture..."
 msgstr "Exporter comme image..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interface"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Type de données"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Énumération"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagramme de classes..."
@@ -1874,26 +2040,10 @@ msgstr "Diagramme de séquences..."
 msgid "Collaboration Diagram..."
 msgstr "Diagramme de collaboration..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attributs"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Opérations"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Publique seulement"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibilité"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Opération de la signature"
@@ -1906,11 +2056,6 @@ msgstr "Attribut de la signature"
 msgid "Stereotype"
 msgstr "Stéréotype"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Afficher"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribut..."
@@ -1935,14 +2080,6 @@ msgstr "Couleur de remplissage..."
 msgid "Use Fill Color"
 msgstr "Utiliser la couleur de remplissage"
 
-#: 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 "Couleurs"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Acteur..."
@@ -1971,10 +2108,26 @@ msgstr "Énumération..."
 msgid "Package..."
 msgstr "Paquetage..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Début de scénario"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Fin de scénario"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "État..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Départ"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Fin"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Sous-système..."
@@ -2019,6 +2172,14 @@ msgstr "Supprimer l'ancrage de note"
 msgid "Change Association Name..."
 msgstr "Changer le nom de l'association..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Effacer le diagramme"
@@ -2053,202 +2214,107 @@ msgstr "le dossier du fichier"
 
 #: 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 ""
-"conserver l'arborescence utilisée pour conserver les vues du document dans le "
-"dossier cible"
+"conserver l'arborescence utilisée pour conserver les vues du document dans "
+"le dossier cible"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 Les auteurs du modeleur UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Utilisation de l'association incorrecte"
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Erreur d'association"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Le dossier « %1 » n'existe pas."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Impossible d'ouvrir le dossier « %1 »."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Caulier Gilles,Simon Depiets,Nicolas Ternisien"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "caulier.gilles@free.fr,2df@tuxfamily.org,nicolas.ternisien@gmail.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 "Prêt."
-
-#: 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 ""
-"Maintenez Maj ou Ctrl appuyé pour déplacer dans l'axe horizontal. Maintenez Maj "
-"et Ctrl appuyé pour déplacer dans l'axe vertical. Faites un clic droit pour "
-"annuler le déplacement."
-
-#: 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 ""
-"Maintenez Maj ou Ctrl appuyé pour déplacer dans l'axe horizontal. Maintenez Maj "
-"et Ctrl appuyé pour déplacer dans l'axe vertical. Faites un clic droit pour "
-"annuler le redimensionnement."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "La portée %1 est-elle un espace de noms ou une classe ?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "L'importation C++ a besoin de votre aide"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Espace de noms"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importation du fichier : %1. Progression : %2 / %3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Erreur interne"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Erreur de syntaxe avant « %1 »"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Erreur de syntaxe avant « %1 »"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nouvel_acteur"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "expression attendue"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nouveau_cas_d_utilisation"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Erreur de syntaxe de déclaration"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nouveau_paquetage"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} attendu"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nouveau_composant"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace attendu"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nouveau_noeud"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ attendu"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nouvel_objet_composite"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Nom de namespace attendu"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nouvelle_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "A besoin d'un spécificateur de type pour déclarer"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nouveau_type_de_donnée"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "déclaration attendue"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nouvelle_énumération"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Expression constante attendue"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nouvelle_entité"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "« ) » attendue"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nouveau_dossier"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} manquante"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nouvelle_association"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Initialiseurs de membres attendus"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nouvel_objet"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Spécificateur de la classe de base attendu"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Clause d'initialisation attendue"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Vide"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identifier attendu"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argument mal formé"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Id de type attendu"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Type d'argument inconnu"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Nom de classe attendu"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nom de méthode illégal"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "condition attendue"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Type de retour inconnu"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "état attendu"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Erreur non spécifiée"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "initialisation du for attendue"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"C'est un mot-clé réservé pour le langage dans le générateur de code "
+"configuré."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch attendu"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Mot-clé réservé"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2262,106 +2328,66 @@ msgstr "Saisir le nom de l'objet :"
 msgid "new_parameter"
 msgstr "nouveau_paramètre"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Options générales"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Le paquetage est un espace de noms"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Destructeurs virtuels"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Générer des constructeurs vides"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Génération des méthodes d'accès"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Les opérations sont incorporées au texte"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Les accesseurs sont incorporés au texte"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Les accesseurs sont publics"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagramme : « %2 » page %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Saisissez le nom du diagramme"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Ajouter une classe de base"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Saisissez le nouveau nom du diagramme :"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Ajouter une classe dérivée"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Le diagramme sera entièrement supprimé.\n"
-"Voulez-vous continuer ?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Ajouter une opération"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Supprimer le diagramme ?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Ajouter un attribut"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Renommage annulé"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Ajouter une interface de base"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Le renommage d'un élément du type de liste %1 n'est pas encore implémenté."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Ajouter une interface dérivée"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Fonction non implémentée"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Propriété de la classe de base"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Le nom que vous avez saisi était incorrect.\n"
-"Le processus de renommage a été annulé."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Propriété de la classe dérivée"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nouvelle_association"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Saisir le nom de l'état"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nouvel_attribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Saisir le nom du nouvel état :"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nouvelle_classe_paramétrable"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Saisir le nom de l'activité"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nouvelle_opération"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Utilisation de l'association incorrecte"
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nouvelle_expression_littérale"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Erreur d'association"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nouveau_champ"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nouvel_état"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2517,11 +2543,6 @@ msgstr "&Exporter comme image..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Exporter tous les diagr&ammes en tant qu'images..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Propriétés"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Glissière de &zoom"
@@ -2606,14 +2627,21 @@ msgstr "&Documentation"
 msgid "Opening file..."
 msgstr "Ouverture d'un fichier..."
 
+#: 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 "Créer un nouveau document..."
 
 #: 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"
@@ -2650,6 +2678,10 @@ msgstr ""
 "*.xmi.tar.bz2|Fichier XMI compacté par Bzip2\n"
 "*|Tous les fichiers"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2658,6 +2690,10 @@ msgstr ""
 "Le fichier « %1 » existe déjà.\n"
 "Voulez-vous l'écraser ?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Écraser"
@@ -2693,12 +2729,12 @@ msgstr "Insertion du contenu du presse-papiers..."
 
 #: 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 ""
 "Umbrello ne peut pas coller le contenu du presse-papiers. Les éléments du "
-"presse-papiers sont d'un type incompatible ou ne peuvent pas être collés à cet "
-"emplacement."
+"presse-papiers sont d'un type incompatible ou ne peuvent pas être collés à "
+"cet emplacement."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2755,1271 +2791,1347 @@ msgstr "Tous les fichiers"
 msgid "Select Code to Import"
 msgstr "Sélectionner le code à importer"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nom de la classe :"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nom de l'acteur :"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nouvel_attribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nom du paquetage :"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nouvelle_classe_paramétrable"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nom du cas d'utilisation :"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nouvelle_opération"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nom de l'interface :"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nouvelle_expression_littérale"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nom du composant :"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nouveau_champ"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nom de l'objet composite :"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Modèle UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Nom de l'é&numération :"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Vue logique"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nom du type de données :"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Vue des cas d'utilisation"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nom de l'entité :"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Composants"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Nom du &stéréotype :"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Déploiements"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Nom du &paquetage :"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Modèle de relations entre entités"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Classe d'a&bstraction"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Types de données"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Cas d'utilisation a&bstrait"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Le fichier courant a été modifié.\n"
+"Voulez-vous l'enregistrer ?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Exécutable"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Le fichier « %1 » n'existe pas."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Représentation graphique"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Le fichier %1 semble avoir été corrompu"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Par &défaut"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Il n'y a pas de fichier XMI trouvé dans le fichier compacté %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&liothèque"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Une erreur est apparue lors du chargement du fichier extrait: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Table"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Une erreur est apparue lors du chargement du fichier « %1 »"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublique"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Une erreur est apparue lors du téléchargement du fichier « %1 »"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivé"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagramme de cas d'utilisations"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tégé"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagramme de classes"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "I&mplantation"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagramme de séquences"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nom de la classe :"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagramme de collaborations"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nom de l'instance :"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagramme d'états"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Dessiner comme un acteur"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagramme d'activités"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Collection d'instances"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagramme de composants"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Afficher la marque de destruction"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagramme de déploiements"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nom du composant :"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagramme de relations entre entités"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nom du noeud :"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "C'est un nom incorrect pour un diagramme."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nom du stéréotype :"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Un diagramme utilise déjà ce nom."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Le nom que vous avez choisi\n"
-"est déjà utilisé.\n"
-"Le nom sera effacé."
+"Le nom du paramètre que vous avez saisi n'est pas unique.\n"
+"Est-ce que c'était ce que vous vouliez ?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Nom non unique"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Nom à utiliser"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Ligne :"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Saisissez le nouveau nom"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Remp&lissage :"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Confirmez-vous la suppression du diagramme « %1 » ?"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Par dé&faut"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Supprimer le diagramme"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Utiliser la couleur de remplissage"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Paramétrage du document..."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Activités"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Résolution des références des objets..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nouvelle activité..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Chargement des éléments UML..."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Renommer"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Chargement des diagrammes..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nouvelle activité"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/EnregistrementAuto%1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Renommer l'activité"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externaliser le dossier"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Saisir le nouveau nom de l'activité :"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Saisissez le nom du modèle"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Propriétés de l'association"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Saisissez le nouveau nom du modèle :"
 
-#: 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 "Configurations générales"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vues"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Rôles"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Le nom que vous avez saisi était incorrect.\n"
+"Le processus de création a été annulé."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Paramétrages des rôles"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nom incorrect"
 
-#: 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 "Paramétrages de la police de caractères"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Le nom que vous avez saisi n'est pas unique !\n"
+"Le processus de création sera annulé."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Police de caractères pour les associations"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Création annulée"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Propriétés de la classe paramétrable"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Chargement de la liste d'affichage..."
 
-#: 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 "Propriétés générales"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Le dossier doit être vide avant d'être supprimé."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Type :"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Dossier non vide"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nom :"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Renommage annulé"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Vous avez saisi un nom de classe paramétrable non valable."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Le renommage d'un élément du type de liste %1 n'est pas encore implémenté."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nom de classe paramétrable incorrect"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Fonction non implémentée"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Le nom du paramètre du modèle que vous avez choisi est déjà utilisé dans cette "
-"opération."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Le nom du modèle n'est pas unique"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Propriétés de l'attribut de l'entité"
+"Le nom que vous avez saisi était incorrect.\n"
+"Le processus de renommage a été annulé."
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Valeur par &défaut :"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagramme : « %2 » page %1"
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Longueur / Valeurs :"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Saisissez le nom du diagramme"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto incrémentation"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Saisissez le nouveau nom du diagramme :"
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Autoriser la valeur « &null »"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Le diagramme sera entièrement supprimé.\n"
+"Voulez-vous continuer ?"
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributs :"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Supprimer le diagramme ?"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexation"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Exportation de la vue..."
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Aucun"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Une erreur s'est produite lors de l'exportation de l'image :\n"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primaire"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Le fichier « %1 » existe déjà.\n"
+"Voulez-vous l'écraser ?"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Le fichier existe déjà"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unique"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Impossible de créer le dossier : %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Vous avez saisi un nom d'attribut d'entité non valable."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Impossible d'enregistrer un diagramme vide"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nom d'attribut d'entité non valable"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
+"Une erreur s'est produite lors de l'enregistrement du diagramme dans %1"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlwidgetcontroller.cpp:128
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"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 ""
-"Le nom de l'attribut de l'entité que vous avez choisi est déjà utilisé dans "
-"cette opération."
+"Maintenez Maj ou Ctrl appuyé pour déplacer dans l'axe horizontal. Maintenez "
+"Maj et Ctrl appuyé pour déplacer dans l'axe vertical. Faites un clic droit "
+"pour annuler le déplacement."
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Le nom de l'attribut de l'entité n'est pas unique"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Affichage"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Options d'affichage des classes"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Couleurs du diagramme"
+#: 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 ""
+"Maintenez Maj ou Ctrl appuyé pour déplacer dans l'axe horizontal. Maintenez "
+"Maj et Ctrl appuyé pour déplacer dans l'axe vertical. Faites un clic droit "
+"pour annuler le redimensionnement."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Le nom que vous avez saisi est incorrect."
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objet"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Le nom que vous avez saisi n'est pas unique."
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Message synchrone"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type :"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Message asynchrone"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Configuration d'Umbrello"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Libellé"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interface utilisateur"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Note"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Paramètres de l'interface utilisateur"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Boîte"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Couleur des lignes :"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relation"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Coul&eur par défaut"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Association directionnelle"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Couleur de remplissage :"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Hiérarchie"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Coul&eur par défaut"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Historique complet"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Largeur de la ligne :"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Historique bref"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "&Largeur par défaut"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Jointure"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Utiliser la couleur de remplissage"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Séparation"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Activer l'annulation"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Jonction"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Utiliser les diagrammes en onglets"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Choix"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Utiliser les nouveaux générateurs C++ / Java / Ruby"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Transition d'activité"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Utiliser des lignes d'association angulaires"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Message"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Enregistrement automatique"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "Non défini"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Activer l'e&nregistrement automatique"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Sélectionner"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
-"Sélectionner l'intervalle pour l'enregistrement automatique (minutes) :"
-
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Suffixe d'enregistrement automatique:"
-
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Si l'enregistrement automatique se produit avant que vous n'ayez enregistré "
-"manuellement le fichier, il se fera dans le fichier ~/autosave.xml.</p> "
-"<p>Dans le cas contraire, l'enregistrement automatique se fera dans le même "
-"dossier que le document et sous le même nom de fichier, suivi du suffixe "
-"choisi.</p> "
-"<p>Si le suffixe est identique au suffixe du fichier que vous avez enregistré, "
-"l'enregistrement automatique écrasera automatiquement votre fichier.</p></qt>"
-
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Démarrage"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logo de déma&rrage"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "As&tuce du jour"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Charger &le dernier projet"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Démarrer un nouveau projet avec :"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Aucun diagramme"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagramme de classes"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagramme de cas d'utilisation"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagramme de séquences"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagramme de collaborations"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Afficher les opérations"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagramme d'état"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagramme d'activités"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Effacer le diagramme"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagramme de composants"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagramme de déploiements"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Généralisation"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Paramétrages des classes"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Afficher la &visibilité"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Afficher les attributs"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nom de l'association"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Afficher les opérations"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Afficher le stéréot&ype"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Afficher l'attribut de la signature"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Afficher le paquetage"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Par &défaut"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Début de la portée"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Portée de l'attribut par défaut :"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-Slash (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Portée de l'opération par défaut :"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-Étoile (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Génération du code source"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Style :"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Paramètres pour la génération du code source"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Génération de code C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Paramètres pour le visualisateur de code source"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Génération du corps de la méthode"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Propriétés de l'opération"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Utiliser ceci pour les classes dans code généré :"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Opér&ation d'abstraction"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Classe &statique (« static »)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vecteur"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "Re&quête (« const »)"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variable</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Protégé&e"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplantation"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Paramètres"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Nouvea&u paramètre..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Chaîne</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Vous avez saisi un nom de paramètre non valable."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Liste</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nom de paramètre non valable"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Le nom du paramètre que vous avez choisi\n"
-"est déjà utilisé dans cette opération."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global ?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Le nom du paramètre n'est pas unique"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"Le nom du paramètre que vous avez choisi est déjà utilisé dans cette opération."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nom de la classe"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Vous avez saisi un nom d'opération non valable."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Fichier en-tête</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nom d'opération non valable"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Génération du projet"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Une opération avec cette signature existe déjà dans « %1 ».\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Créer un fichier de construction pour le programme « Ant »"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Choisissez un nom ou une liste de paramètres différente."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Générer automatiquement les méthodes"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Propriétés de la classe A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Méthodes des constructeurs vides"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Propriétés de la classe B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Méthodes d'accès à l'association"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Visibilité du rôle de la classe A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Méthodes d'accès à l'attribut"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Visibilité du rôle de la classe B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Depuis l'objet parent"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Propriété du rôle de la classe A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Portée de l'attribut par défaut :"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Propriété du rôle de la classe B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Portée de l'opération par défaut :"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Éléments contenus"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Depuis le rôle parent"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Note de documentation"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Génération de code Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Nouv&el attribut..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Dièse (« # »)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nouv&elle opération..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Début-fin (=degin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Classes paramétrables"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Génération de code Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Nouv&elle classe paramétrable..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Langage"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Énumérations littérales"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Dossiers"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Nouv&elle énumération littérale..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Écrire tous les fichiers générés dans le dossier :"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Attributs de l'entité"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Parcourir..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Nouv&el attribut pour l'entité..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Pa&rcourir..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Départ"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Inclure les fichiers d'en-tête du dossier :"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Fin"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Les fichiers créés par le processus de génération du code source seront "
+"écrits dans ce dossier"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Type d'activité :"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Les fichiers de ce dossier seront utilisés comme fichiers d'en-tête lors de "
+"la génération du code source"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nom de l'activité :"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Politique d'écrasement des fichiers"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Couleurs de l'élément graphique"
+#: 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 ""
+"Si un fichier a le même nom que celui qui est\n"
+"généré avec le code source :"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Propriétés de l'attribut"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Écra&ser"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Valeur &initiale :"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
+"Écraser le fichier existant si celui ci existe déjà dans le dossier de "
+"destination"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Publique"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Deman&der confirmation"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Vous avez saisi un nom d'attribut non valable."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Demander confirmation si un fichier avec le même nom existe déjà avant de "
+"l'écraser"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nom d'attribut non valable"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Utiliser un nom différent"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"Le nom de l'attribut que vous avez choisi est déjà utilisé dans cette "
-"opération."
+"Si un fichier existe déjà dans le dossier de destination, sélectionne un nom "
+"différent en ajoutant un suffixe au nom du fichier"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Le nom de l'attribut n'est pas unique"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Mise en forme"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Sélectionner l'opération"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Lignes"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Séquence numéro :"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Style de fin de ligne :"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Opération de la classe :"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Type d'indentation :"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Opération personnalisée :"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Indentation en amont :"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammes"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
+"*NIX (\"\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtre"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr ""
+"Windows (\"\\r\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Diagramme &courant"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Tous les di&agrammes"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Aucune indentation"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Sélectionner les diagrammes"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Déplacer"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Type de diagramme"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Espace"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Sélection"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Verbosité des commentaires"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Collaboration"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Écrire des com&mentaires pour les sections, même\n"
+"si elles sont vides"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Séquence"
+#: 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 ""
+"Écrire des commentaires pour indiquer les différentes sections (publique, "
+"privée, etc) dans une classe, même si ces sections sont vides"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Déploiement"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Écrire des commentaires même si les documentations sont &vides"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Aucun diagramme n'a été sélectionné."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Écrire des commentaires pour les classes et les mét&hodes dont les "
+"documentations sont vides"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Options d'affichage"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Options pour les langages de programmation"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Paramètres de l'attribut"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Assistant de génération du code source"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Paramètres de l'opération"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Sélectionner les classes"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Paramètres des classes paramétrables"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Placer toutes les classes dont vous voulez générer le code source\n"
+"dans la liste latérale de droite"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Paramètres pour les énumérations littérales"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Ajouter une classe pour la génération du code source"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Paramètres des attributs de l'entité"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Classes sélectionnées"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Paramètres des contenus"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Supprimer une classe pour la génération du code source"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associations"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Classes disponibles"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Classe d'associations"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "État de la génération du code source"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Opératio&ns"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Appuyer sur le bouton « Générer » pour démarrer la génération de code"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibilité"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Générer les états"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&pération de la signature"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Afficher les blocs cachés"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&quetage"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">le nom du composant logiciel ici</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributs"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stéréot&ype"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Afficher les types de blocs"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibut de la signature"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Couleurs"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Dessiner comme un cercle"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Police de caractères :"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Début de scénario"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papier :"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Fin de scénario"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Sélection :"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Type d'état :"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Bloc objet UML :</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nom de l'état :"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Bloc caché :</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Couleur de l'élément graphique"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Texte non modifiable :</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nouvelle_classe"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Texte modifiable :</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nouvelle classe"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Propriétés du diagramme"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Attributs de la classe"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zoom :"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Opérations de la classe"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Propriétés des paramètres"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Afficher le quadrilla&ge"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Direction de passage"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Placer les élémen&ts sur le quadrillage"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Adapter la taille du composant"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"« in » est un paramètre de lecture seule, « out » est un paramètre d'écriture "
-"seule et « inout » est un paramètre de lecture / écriture."
+"Adapte la taille des composants à un multiple de la valeur d'espacement qui "
+"est utilisé pour le quadrillage.\n"
+"Si l'option « Placer les composants sur le quadrillage » est activée, un "
+"composant sera toujours aligné avec le quadrillage en utilisant quatre "
+"unités d'espacement."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Générer"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Espacement du quadrillage:"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Terminer"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Code généré"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Non généré"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Largeur de la ligne :"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Pas encore généré"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exporter toutes les vues"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Le dossier « %1 » n'existe pas. Voulez-vous le créer maintenant ?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Dossier dans lequel enregistrer les diagrammes :"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Le dossier de destination n'existe pas"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Le dossier de base utilisé pour enregistrer les images"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Créer un dossier"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Type d'&image :"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ne pas créer"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Utiliser des &dossiers"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Impossible de créer le dossier.\n"
-"Veuillez vous assurer que vous avez les droits en écriture sur le dossier "
-"parent, ou en sélectionnez un autre valable."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Erreur lors de la création du dossier"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Veuillez sélectionner un dossier valable."
+"Créer dans le dossier cible l'arborescence utilisée dans\n"
+"le document pour conserver les vues"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Le dossier de destination existe, mais il est impossible d'y écrire.\n"
-"Veuillez définir ses droits en écriture ou en choisir un autre."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Erreur d'écriture dans le dossier de destination"
+"Les vues sont conservées dans des dossiers dans le document. L'arborescence "
+"utilisée dans le document pour conserver les vues peut être créée dans le "
+"dossier de base choisi, grâce à cette option.\n"
+"Seuls les dossiers locaux créés par l'utilisateur sont créés dans le dossier "
+"de base (vue logique, les autres ne sont pas créées)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr ""
-"« %1 » ne semble pas être un dossier. Veuillez sélectionner un dossier correct."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Propriété du rôle de la classe B"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Veuillez choisir un dossier correct"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Visibilité du rôle"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Le fichier de destination existe déjà"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exporter"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Le fichier de destination « %1 » existe déjà dans « %2 ».\n"
-"\n"
-"Umbrello peut écraser le fichier, générer un nom de fichier similaire\n"
-"ou ne pas générer ce fichier."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Appliquer à tous les fichiers restants"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Écra&ser"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Générer un nom de fichier similaire"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Ne pas générer de fichier"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Aucune option disponible.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Cardinalité"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Saisir la cardinalité :"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nom de l'association"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Saisissez le nom de l'association :"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nom du rôle"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Saisir le nom du rôle :"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Donnez le nom de l'opération :"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Saisir le nouveau texte :"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERREUR"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Modifier le texte"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Aligner à gauche"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Aligner à droite"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagramme"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Aligner en haut"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nouveau"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Aligner en bas"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Aff&icher"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Aligner au milieu verticalement"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zoom :"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Aligner au milieu horizontalement"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "C&ode source"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Aligner verticalement de façon distribuée"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Langage de programmation courant"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Aligner horizontalement de façon distribuée"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Pour l'alignement vous devez sélectionner au moins deux objets comme les "
-"classes ou acteurs. Vous ne pouvez pas aligner des associations."
+"<p>Bienvenue sur Umbrello.</p>\n"
+"<p>Les diagrammes UML vous permettent de concevoir et documenter des "
+"logiciels basés sur un modèle objet. <a href=\"help:/umbrello\">Le manuel "
+"d'utilisation d'Umbrello</a> est une bonne introduction sur l'utilisation "
+"d'UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"C'est un mot-clé réservé pour le langage dans le générateur de code configuré."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Mot-clé réservé"
+"<p>Bienvenue sur Umbrello 1.5. Les nouveautés de cette version sont les "
+"classes d'associations, la génération de code Ruby, les dossiers "
+"externalisables, la capacité de modifier les interfaces en classes et bien "
+"plus encore.</p>\n"
 
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Exportation de la vue..."
-
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Une erreur s'est produite lors de l'exportation de l'image :\n"
+"<p>Les diagrammes en onglets et les dossiers externalisables sont "
+"mutuellement exclusifs. Si vous utilisez les dossiers externes, veuillez "
+"désélectionner l'option « Utiliser les diagrammes en onglets » dans les "
+"préférences générales.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Le fichier « %1 » existe déjà.\n"
-"Voulez-vous l'écraser ?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Le fichier existe déjà"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nouvel_acteur"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nouveau_cas_d_utilisation"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nouveau_paquetage"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nouveau_composant"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nouveau_noeud"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nouvel_objet_composite"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nouvelle_interface"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nouveau_type_de_donnée"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nouvelle_énumération"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nouvelle_entité"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nouveau_dossier"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nouvel_objet"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Vide"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argument mal formé"
+"<p>La plupart des diagrammes ne peuvent pas être redimensionnés, mais seront "
+"automatiquement redimensionnés en fonction de leur contenu.\n"
+"Les boîtes, les notes, et les messages de diagrammes de séquences peuvent\n"
+"être redimensionnés en cliquant et en tirant sur le bord de couleur rouge.</"
+"p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Type d'argument inconnu"
+#: 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 ""
+"<p>Si vous voulez ajouter une classe déjà existante dans un diagramme, "
+"glissez et déposez-le sur l'entrée de la vue en arborescence correspondante "
+"au diagramme.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nom de méthode illégal"
+#: 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 ""
+"<p>Le nouvel agent de reconstruction d'Umbrello vous permet de déplacer des "
+"opérations entre une classe et ses dérivés et les classes de base.\n"
+"Faites un clic droit sur une classe pour ouvrir l'agent de reconstruction.</"
+"p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Type de retour inconnu"
+#: 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 ""
+"<p>Les objets d'un diagramme de séquences peuvent disposer d'une marque de "
+"destruction et peuvent être dessinés comme des acteurs.\n"
+"Double cliquez sur celui-ci pour afficher la boîte de dialogue de "
+"paramétrage des propriétés de l'objet.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Erreur non spécifiée"
+#: 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 ""
+"<p>Les messages du diagramme de séquence peuvent jouer le rôle de "
+"constructeurs. Cliquez sur la boîte de l'objet (plutôt que sur la ligne "
+"verticale) pour le transformer en constructeur.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Ajouter une classe de base"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Les messages des diagrammes de séquence peuvent être reliés à eux-mêmes. "
+"Recliquez sur la même ligne verticale pour créer un message automatique.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Ajouter une classe dérivée"
+#: 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 ""
+"<p>Si lors du chargement d'un fichier distant rien ne s'affiche sur la "
+"liste, essayez d'enregistrer le modèle sous un nom différent, puis le fermer "
+"et recharger le fichier enregistré. La liste est alors remplie "
+"correctement.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Ajouter une opération"
+#: 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 ""
+"<p>Le copier / coller pourra exporter une sélection dans un diagramme vers "
+"une image au\n"
+"format PNG pour pouvoir l'utiliser dans une autre application comme KWord.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Ajouter un attribut"
+#: 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 ""
+"<p>Les associations ne sont pas obligatoirement en lignes droites. En double "
+"cliquant sur l'une d'entre elles, vous créez un point de cassure mobile.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Ajouter une interface de base"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Vous pouvez activer l'enregistrement automatique dans la boîte de "
+"dialogue de configuration d'Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Ajouter une interface dérivée"
+#: 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 ""
+"<p>Une fonctionnalité est manquante dans Umbrello ? Veuillez nous contacter "
+"pour nous faire part de vos besoins et de vos souhaits en écrivant un "
+"rapport de bogue, ou en envoyant un courrier électronique sur la liste de "
+"diffusion « uml-devel ».</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Propriété de la classe de base"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Vous pouvez supprimer tous les objets en utilisant les touches « Suppr » "
+"ou « Backspace ».</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Propriété de la classe dérivée"
+#: 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 ""
+"<p>Si vous avez trouvé un bogue dans Umbrello, veuillez nous contacter.\n"
+"Vous pouvez soumettre des rapports de bogues en utilisant l'option « Rapport "
+"de bogue » disponible dans le menu « Aide ».</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Impossible de créer le dossier : %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 ""
+"<p>Une pression sur la touche Échap sélectionne l'outil courant.\n"
+"Une pression sur la touche Correction (Backspace) retourne à l'outil "
+"précédemment utilisé.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Impossible d'enregistrer un diagramme vide"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>Vous pouvez sélectionner tous les objets en utilisant les touches « Ctrl-"
+"A ».</p>\n"
 
-#: 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 ""
-"Une erreur s'est produite lors de l'enregistrement du diagramme dans %1"
+"<p>Vous pouvez créer et paramétrer une nouvelle classe en utilisant "
+"l'assistant de création d'une nouvelle classe disponible dans le menu « Code "
+"source ».</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "nouveau_stéréotype"
diff --git a/tde-i18n-ga/messages/tdesdk/umbrello.po b/tde-i18n-ga/messages/tdesdk/umbrello.po
index c84f4783db3..71c70571806 100644
--- a/tde-i18n-ga/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ga/messages/tdesdk/umbrello.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 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-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -10,244 +10,197 @@ 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"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
 msgstr ""
 
-#: docgenerators/main.cpp:47
-msgid "File to transform"
+#: 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 "Iontráil ainm an ghnímh nua:"
+
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Ailínigh Ar Chlé"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Ailínigh Ar Dheis"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
 msgstr ""
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
 msgstr ""
 
-#: docgenerators/main.cpp:64
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Údair Samhaltóra UML Umbrello"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
+msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 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: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 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
 msgstr ""
 
-# Sábháil Earráid?
-#: 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 "Earráid ag sábháil"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formáidiú"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Réad"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Teachtaireacht Shioncrónach"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Ginearálú"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Teachtaireacht Aisioncrónach"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr "Comhbhailiúchán"
+
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Spleáchas"
 
 #: association.cpp:87 worktoolbar.cpp:248
 msgid "Association"
 msgstr "Comhcheangal"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
+#: association.cpp:88
+msgid "Self Association"
 msgstr ""
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ancaire"
-
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Lipéad"
-
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Nóta"
-
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Bosca"
-
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aisteoir"
-
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Spleáchas"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr ""
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
-msgstr "Comhbhailiúchán"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Gaol"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr ""
 
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Gaolmhaireacht Threoch"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr ""
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Feidhmiú (Ginearálú/Réadú)"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr ""
 
 #: association.cpp:94 worktoolbar.cpp:260
 msgid "Composition"
 msgstr "Comhdhéanamh"
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Cás Úsáide"
-
-#. 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 "Aicme"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Staid Tosaigh"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Staid Deiridh"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Craobhaigh/Cumaisc"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Forc/Snaidhm"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pacáiste"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Comhpháirt"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nód"
-
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Déantán"
-
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Comhéadan"
-
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Cineál sonraí"
-
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Áirithe"
-
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Aonán"
-
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Stair Dhomhain"
-
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Stair Éadomhain"
-
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Snaidhm"
-
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Forc"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Fíorú"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Cumar"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Rogha"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ancaire"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Trasdul Staide"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Trasdul Gnímh"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Gníomh"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Staid"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Iolracht"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Gníomh Deiridh"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Gníomh Tosaigh"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Teachtaireacht"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr ""
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "GAN SAINMHÍNIÚ"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Roghnaigh"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr ""
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Is ainm neamhbhailí é sin."
+
+#: 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 "Ainm Neamhbhailí"
+
+#: 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 ""
+
+#: 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 ""
 
 #: 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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -265,10 +218,8 @@ msgid "Cannot Open File"
 msgstr "Ní Féidir Comhad a Oscailt"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ní féidir an fillteán a chruthú:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ní féidir an fillteán a chruthú:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -280,1266 +231,1495 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Ní féidir fillteán a chruthú"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr ""
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Roghanna Ginearálta"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Is ainmspás é an pacáiste"
 
-#: 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 "Iontráil ainm an ghnímh nua:"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Scriostóirí fíorúla"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "gníomh nua"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Gin cruthaitheoirí folmha"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Samhail UML"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Gin rochtaineoirí"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Amharc Loighciúil"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Is inlíne iad na hoibríochtaí"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Amharc ar Chás Úsáide"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Is inlíne iad na rochtaineoirí"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Amharc Comhpháirte"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Is poiblí iad na rochtaineoirí"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Amharc Imlonnaithe"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Samhail Ghaoil na nAonán"
+#: 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 "Réidh."
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Cineálacha Sonraí"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
-"Athraíodh an comhad reatha.\n"
-"Ar mhaith leat é a shábháil?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Níl an comhad %1 ann."
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Ainmspás"
 
-#: 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 "Earráid Luchtaithe"
+#: 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 "Aicme"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr ""
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Earráid Inmheánach"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "bhíothas ag súil le slonn"
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "léaráid de chás úsáide"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "ag súil le }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "léaráid aicme"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "bhíothas ag súil le hainmspás"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "ag súil le {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "léaráid chomhoibrithe"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "léaráid ghnímh"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "léaráid chomhpháirt"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "léaráid imlonnaithe"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "ag súil le ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "léaráid de ghaoil na n-aonán"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} ar iarraidh"
 
-#: 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 "Ainm"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "Iontráil ainm:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Ainm Neamhbhailí"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Tá léaráid ann leis an ainm sin cheana."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
 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."
-msgstr "Is ainm neamhbhailí é sin."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
+#: 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:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Úsáid Ainm"
+#: 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 "&Airíonna"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Iontráil Ainm Nua"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Gníomh tosaigh"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "An bhfuil tú cinnte gur mian leat léaráid %1 a scriosadh?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Gníomh deiridh"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Scrios Léaráid"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Craobhaigh/Cumaisc"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Cáipéis á socrú..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Forc/Snaidhm"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: 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 "Ginearálta"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Eilimintí UML á luchtú..."
+#: 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 "Airíonna Ginearálta"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Léaráidí á luchtú..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Cineál gnímh:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Léaráid-uml-kde"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ainm an ghnímh:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr ""
+#: 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 "Doiciméadú"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Seachtraigh Fillteán"
+#: 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 "Cló:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "Socruithe na gClónna"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "Dath"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Amhairc"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Dathanna Giuirléidí"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Gnímh"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ainm Neamhbhailí"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Gníomh Nua..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Scrios Ancaire"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Athainmnigh"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Amharc liosta á luchtú..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Gníomh Nua"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr ""
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "gníomh nua"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr ""
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Athainmnigh an Gníomh"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Iontráil ainm nua ar an ghnímh:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Ainm:"
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Cineál:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Ginearálú"
+#: 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 "Socruithe Ghinearálta"
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Róil"
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Socruithe an Róil"
+
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Fíorú"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Export"
-msgstr "&Easpórtáil"
+msgid "Rolename:"
+msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "&Diagram"
-msgstr "Léarái&d"
+msgid "Multiplicity:"
+msgstr "Iolracht"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: 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 "&New"
-msgstr "&Nua"
+msgid "Public"
+msgstr "Poiblí"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: 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 "Sh&ow"
-msgstr "Ta&ispeáin"
+msgid "Private"
+msgstr "Príobháideach"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Cód"
+msgid "Protected"
+msgstr "Cosanta"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Active &Language"
-msgstr "Teanga &Ghníomhach"
+msgid "Implementation"
+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
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Documentation"
-msgstr "Doiciméadú"
+msgid "Changeable"
+msgstr "Inathraithe"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Slais-Slais (//)"
+msgid "Frozen"
+msgstr "Reoite"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Slais-Réiltín (/**  */)"
+msgid "Add only"
+msgstr "Cuir leis amháin"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Stíl:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Ainm aicme:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Giniúint Chóid C++</p>"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Ai&nm aisteora:"
 
-#. 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 "Ginearálta"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Ainm an &phacáiste:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr ""
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Ai&nm an chás úsáide:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Ainm an ch&omhéadain:"
+
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Ai&nm comhpháirte:"
+
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Ai&nm déantáin:"
+
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Ai&nm cineáil sonraí:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "veicteoir"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Ai&nm aonáin:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Athróg</b>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Ainm an steiréitíopa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Ainm an &phacáiste:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "&Aicme theibí"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "teaghrán"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Cás úsáide thei&bí"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Teaghrán</p>"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Comhad inrite"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Liosta</p>"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Tarraing Mar"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Réamhshocrú"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>domhanda?</i>"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Líon:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Leabharlann"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Ainm aicme"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tábla"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Comhad ceanntáisc</p></i>"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Infheictheacht"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Giniúint Tionscadail"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&oiblí"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Cruthaigh cáipéis tógála ANT"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&ríobháideach"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Cos&anta"
+
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Ainm aicme:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Ainm áisc:"
+
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Tarraing mar aisteoir"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Taispeáin díothú"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Ainm comhpháirte:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Ainm nóid:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Ainm an steiréitíopa:"
+
+#: 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 ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
 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 "Poiblí"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Airíonna"
 
-#. 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 "Príobháideach"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Airí &Nua..."
 
-#. 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 "Cosanta"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Oibríochtaí"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "&Oibríocht Nua..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Teimpléid"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "T&eimpléad Nua..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Tréithe Aonáin"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Scrios Ancaire"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Airíonna"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Taispeáin"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Oibríochtaí"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Infheictheacht"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&cáiste"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "T&réithe"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "St&eiréitíopa"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hais (#)"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Begin-End (=begin  =end)"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Taispeáin"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Giniúint Chóid Ruby</p>"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Roghanna Taispeána:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
-msgstr "Roghanna Giniúna Cóid"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Teanga"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Fillteáin"
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Bra&bhsáil..."
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "B&rabhsáil..."
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "aicme_nua"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Aicme Nua"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Tréithe Aicme"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Oibríochtaí Aicme"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
+msgid "Code Generation Options"
+msgstr "Roghanna Giniúna Cóid"
+
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Gin"
+
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Críochnaigh"
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Gineadh an Cód"
+
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Níor Gineadh"
+
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Níor Gineadh Fós"
+
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Níl an fillteán %1 ann. Ar mhaith leat é a chruthú anois?"
+
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Níl an fillteán aschurtha ann"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Cruthaigh Fillteán"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ná Cruthaigh"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"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 dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Polasaí Forscríofa"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Earráid Agus Fillteán á Chruthú"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Roghnaigh fillteán bailí le do thoil."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Forscríobh"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Fi&afraigh díom"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Roghnaigh Fillteán Bailí Le Do Thoil"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
+msgid "Code Viewer"
+msgstr "Amharcán Cóid"
+
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Ú&sáid ainm difriúil"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "Léarái&dí"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Scagaire"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formáidiú"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Léaráid reatha"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Línte"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "G&ach léaráid"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Roghnaigh léaráidí"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Cineál eangaithe:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Cineál na léaráide"
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Roghnú"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Cás Úsáide"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Comhoibriú"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Seicheamh"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Staid"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Comhpháirt"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Imlonnú"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Léaráid-uml-kde"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Níl aon léaráid roghnaithe."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Indentation amount:"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Tá an Sprioc-Chomhad Ann Cheana"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Cuir i bhfeidhm ar gach comhad atá fágtha"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Gan Eangú"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "F&orscríobh"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Táb"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Spás"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Ná Gin Comhad"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
 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/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Cineál:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "Ai&nm:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Luach tosa&igh:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"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 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 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/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Roghnaigh Oibríocht"
+
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Roghanna Teanga"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Treoraí Giniúna Cóid"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Roghnaigh Aicmí"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Socrú Umbrello"
 
-#. 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:47
+msgid "User Interface"
+msgstr "Comhéadan Úsáideora"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Socruithe an Chomhéadain"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Dath líne:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "D&ath Réamhshocraithe"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Dath an líonta:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Da&th Réamhshocraithe"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Leithead líne:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "L&eithead Réamhshocraithe"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "Ú&sáid dath an líonta"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Aicmí Roghnaithe"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Úsáid léaráidí le cluaisíní"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Úsáid gineadóirí nua C++/Java/Ruby"
+
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Aicmí Le Fáil"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Uathshábháil"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Stádas Giniúna Cóid"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Cumasaigh uathshábháil"
 
-#. 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:136
+msgid "Select auto-save time interval (mins):"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Stádas Giniúna"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Amharcán Cóid"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Taispeáin bloic fholaithe"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Tosú"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">ainm comhpháirte anseo</p>"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Lógó &tosaithe"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Taispeáin cineál an bhloic"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Leid an lae"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Dathanna"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Luchtaigh an tionscadal is déanaí"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Cló:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Tosaigh tionscadal nua le:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Páipéar:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Gan Léaráid"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Roghnaithe:"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Léaráid Aicme"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Léaráid de Chás Úsáide"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Léaráid Chomhoibrithe"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Léaráid Ghnímh"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Léaráid Chomhpháirte"
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Léaráid Imlonnaithe"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Socruithe Aicme"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Taispeáin in&fheictheacht"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Taispeáin tréithe"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Taispeáin oibríochtaí"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Taispeáin st&eiréitíopa"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Téacs ineagarthóireachta:</p>"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Taispeáin pacáiste"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
-msgid "Diagram Properties"
+msgid "Show operation signature"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ainm:"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Scóp Tosaithe"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Súmáil:"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Scóp réamhshocraithe oibríochta:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Giniúint Chóid"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Socruithe Giniúna Cóid"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Socruithe an Amharcáin Cóid"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Staid tosaigh"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Staid deiridh"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Cineál staide:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Ainm na staide:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Dath Giuirléidí"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Airíonna Tréithe"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Taispeáin &greille"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Poiblí"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Léim &go greille"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Cosa&nta"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Tá ainm neamhbhailí tréithe iontráilte agat."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Ainm Neamhbhailí Tréithe"
+
+#: dialogs/umlattributedialog.cpp:163
 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."
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Réamhshocrú:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Leithead líne:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Fad/Luachanna:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "Incrimintigh go u&athoibríoch"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Tréithe:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Innéacsú"
 
-#. 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 "&Neamhní"
+
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Príomha"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Innéacs"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Uathúil"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
+#: 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
-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)."
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
 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:89
+msgid "&Abstract 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:"
-msgstr "Iolracht"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Iarratas (\"const\")"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Paraiméadair"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Cuir leis amháin"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Paraiméadar N&ua..."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Reoite"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "D'iontráil tú ainm neamhbhailí ar pharaiméadar."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Inathraithe"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Ainm Neamhbhailí Paraiméadair"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/umloperationdialog.cpp:339
+msgid ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#: tips.txt:3
+#: dialogs/umloperationdialog.cpp:406
 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"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
 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/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
 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/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
 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/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
 msgstr ""
 
-#: tips.txt:37
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Airíonna an Teimpléid"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Tá ainm neamhbhailí teimpléid iontráilte agat."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Ainm Neamhbhailí Teimpléid"
+
+#: dialogs/umltemplatedialog.cpp:138
 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"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 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/umltemplatedialog.cpp:139
+msgid "Template 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/umlviewdialog.cpp:93
+msgid "Classes Display Options"
 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"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
 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"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "D'iontráil tú ainm neamhbhailí."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
 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"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
 msgstr ""
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Líne:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Líon:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Réamhshocrú"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
 msgstr ""
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: 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: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"
+#: 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: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"
+# Sábháil Earráid?
+#: 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 "Earráid ag sábháil"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
 msgstr ""
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr ""
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr ""
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Údair Samhaltóra UML Umbrello"
+
+#: 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 "Ainm"
+
+#: 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 "Iontráil ainm:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Iontráil téacs nua:"
+
+# --------------------------------------------------------------------
+#   Miscellaneous
+# --------------------------------------------------------------------
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "EARRÁID"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Athraigh téacs"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Níl an comhad fillteáin %1 ann."
+
+#: 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 "Earráid Luchtaithe"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -1594,6 +1774,10 @@ msgstr "Oibríocht Nua..."
 msgid "Select Operation..."
 msgstr "Roghnaigh Oibríocht..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Athraigh téacs..."
@@ -1643,6 +1827,19 @@ msgstr "Nua"
 msgid "Rename..."
 msgstr "Athainmnigh..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Earráid Ghreamaithe"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Dath Líne..."
@@ -1671,14 +1868,26 @@ msgstr ""
 msgid "Import Classes..."
 msgstr "Iompórtáil Aicmí..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pacáiste"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Déantán"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Léaráid Chomhpháirte..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nód"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Léaráid Imlonnaithe..."
@@ -1687,10 +1896,18 @@ msgstr "Léaráid Imlonnaithe..."
 msgid "Folder"
 msgstr "Fillteán"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Aonán"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Léaráid de Ghaoil na nAonán..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aisteoir"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Léaráid de Chás Úsáide..."
@@ -1727,6 +1944,18 @@ msgstr ""
 msgid "Export as Picture..."
 msgstr "Easpórtáil mar Phictiúr..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Comhéadan"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Cineál sonraí"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Áirithe"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Léaráid Aicme..."
@@ -1747,26 +1976,10 @@ msgstr ""
 msgid "Collaboration Diagram..."
 msgstr "Léaráid Chomhoibrithe..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Airíonna"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Oibríochtaí"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Poiblí Amháin"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Infheictheacht"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr ""
@@ -1779,11 +1992,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr "Steiréitíopa"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Taispeáin"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1808,14 +2016,6 @@ msgstr "Dath an Líonta..."
 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 "Dath"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aisteoir..."
@@ -1844,10 +2044,26 @@ msgstr "Áirithe..."
 msgid "Package..."
 msgstr "Pacáiste..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Staid Tosaigh"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Staid Deiridh"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Staid..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Gníomh Tosaigh"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Gníomh Deiridh"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr ""
@@ -1892,6 +2108,14 @@ msgstr "Scrios Ancaire"
 msgid "Change Association Name..."
 msgstr ""
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Bánaigh an Léaráid"
@@ -1926,193 +2150,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 "© 2001 Paul Hensgen, © 2002-2006 Údair Samhaltóra UML Umbrello"
 
-#: 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 "Níl an comhad fillteáin %1 ann."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
-
-#: 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 "Réidh."
-
-#: 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
-msgid "Namespace"
-msgstr "Ainmspás"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Earráid Inmheánach"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "aisteoir_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "cásúsáide_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "bhíothas ag súil le slonn"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "pacáiste_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "comhpháirt_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "ag súil le }"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nód_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "bhíothas ag súil le hainmspás"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "déantán_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "ag súil le {"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "comhéadan_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "cineálsonraí_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "áirithe_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr ""
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "aonán_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
+#: model_utils.cpp:264
+msgid "new_folder"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "ag súil le ')'"
-
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} ar iarraidh"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "comhcheangal_nua"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "réad_nua"
 
-#: 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 "Folamh"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr ""
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argóint mhíchumtha"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Cineál anaithnid argóinte"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Ainm neamhcheadaithe ar mhodh"
 
-#: 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"
-msgstr ""
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Earráid gan sonrú"
 
-#: 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"
-msgstr ""
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Eochairfhocal in Áirithe"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2126,101 +2259,66 @@ msgstr "Iontráil ainm an réada:"
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Roghanna Ginearálta"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Is ainmspás é an pacáiste"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Scriostóirí fíorúla"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Gin cruthaitheoirí folmha"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Gin rochtaineoirí"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Is inlíne iad na hoibríochtaí"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Is inlíne iad na rochtaineoirí"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Is poiblí iad na rochtaineoirí"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Léaráid: %2 Leathanach %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: 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?"
-msgstr "Scrios Léaráid?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Cuir Tréith Leis"
 
-#: 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"
-msgstr "comhcheangal_nua"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr ""
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "tréith_nua"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr ""
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "teimpléad_nua"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr ""
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "oibríocht_nua"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr ""
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "oibreann_nua_litriúil"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr ""
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "réimse_nua"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr ""
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2374,11 +2472,6 @@ msgstr "&Easpórtáil mar Phictiúr..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Airíonna"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2463,14 +2556,21 @@ msgstr "&Doiciméadú"
 msgid "Opening file..."
 msgstr "Comhad á oscailt..."
 
+#: 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 "Cáipéis nua á cruthú..."
 
 #: 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"
@@ -2507,12 +2607,20 @@ msgstr ""
 "*.xmi.tar.bz2|Comhad XMI Comhbhrúite le Bzip2\n"
 "*|Gach Comhad"
 
+#: 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 "Forscríobh"
@@ -2548,8 +2656,8 @@ msgstr ""
 
 #: 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
@@ -2605,1228 +2713,1219 @@ msgstr "Gach Comhad"
 msgid "Select Code to Import"
 msgstr "Roghnaigh Cód le hIompórtáil"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Ainm aicme:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Ai&nm aisteora:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "tréith_nua"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Ainm an &phacáiste:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "teimpléad_nua"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Ai&nm an chás úsáide:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "oibríocht_nua"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Ainm an ch&omhéadain:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "oibreann_nua_litriúil"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Ai&nm comhpháirte:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "réimse_nua"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Ai&nm déantáin:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Samhail UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr ""
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Amharc Loighciúil"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Ai&nm cineáil sonraí:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Amharc ar Chás Úsáide"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Ai&nm aonáin:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Amharc Comhpháirte"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Ainm an steiréitíopa:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Amharc Imlonnaithe"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Ainm an &phacáiste:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Samhail Ghaoil na nAonán"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "&Aicme theibí"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Cineálacha Sonraí"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Cás úsáide thei&bí"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Athraíodh an comhad reatha.\n"
+"Ar mhaith leat é a shábháil?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Comhad inrite"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Níl an comhad %1 ann."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Tarraing Mar"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr ""
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Réamhshocrú"
+#: 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:149
-msgid "&Library"
-msgstr "&Leabharlann"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tábla"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&oiblí"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&ríobháideach"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "léaráid de chás úsáide"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Cos&anta"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "léaráid aicme"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Ainm aicme:"
-
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Ainm áisc:"
-
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Tarraing mar aisteoir"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "léaráid chomhoibrithe"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: umldoc.cpp:942
+msgid "state diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Taispeáin díothú"
-
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Ainm comhpháirte:"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "léaráid ghnímh"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Ainm nóid:"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "léaráid chomhpháirt"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Ainm an steiréitíopa:"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "léaráid imlonnaithe"
 
-#: 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 ""
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "léaráid de ghaoil na n-aonán"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Líne:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Líon:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Réamhshocrú"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Tá léaráid ann leis an ainm sin cheana."
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Gnímh"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Gníomh Nua..."
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Úsáid Ainm"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Athainmnigh"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Iontráil Ainm Nua"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Gníomh Nua"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "An bhfuil tú cinnte gur mian leat léaráid %1 a scriosadh?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Athainmnigh an Gníomh"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Scrios Léaráid"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Iontráil ainm nua ar an ghnímh:"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Cáipéis á socrú..."
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 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 "Socruithe Ghinearálta"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Róil"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Socruithe an Róil"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Eilimintí UML á luchtú..."
 
-#: 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 "Socruithe na gClónna"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Léaráidí á luchtú..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Airíonna an Teimpléid"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Seachtraigh Fillteán"
 
-#: 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 "Airíonna Ginearálta"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Cineál:"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "Ai&nm:"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Amhairc"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Tá ainm neamhbhailí teimpléid iontráilte agat."
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Ainm Neamhbhailí Teimpléid"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ainm Neamhbhailí"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Amharc liosta á luchtú..."
+
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Réamhshocrú:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Fad/Luachanna:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "Incrimintigh go u&athoibríoch"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Tréithe:"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Innéacsú"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Léaráid: %2 Leathanach %1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Neamhní"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Príomha"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Innéacs"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Uathúil"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Scrios Léaráid?"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr ""
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Tá an comhad ann cheana"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Taispeáin"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "D'iontráil tú ainm neamhbhailí."
+#: 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/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: 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/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Cineál:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Réad"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Socrú Umbrello"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Teachtaireacht Shioncrónach"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Comhéadan Úsáideora"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Teachtaireacht Aisioncrónach"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Socruithe an Chomhéadain"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Lipéad"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Dath líne:"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Nóta"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "D&ath Réamhshocraithe"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Bosca"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Dath an líonta:"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Gaol"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Da&th Réamhshocraithe"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Gaolmhaireacht Threoch"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Leithead líne:"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Feidhmiú (Ginearálú/Réadú)"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "L&eithead Réamhshocraithe"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Stair Dhomhain"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "Ú&sáid dath an líonta"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Stair Éadomhain"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr ""
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Snaidhm"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Úsáid léaráidí le cluaisíní"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Forc"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Úsáid gineadóirí nua C++/Java/Ruby"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Cumar"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr ""
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Rogha"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Uathshábháil"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Trasdul Gnímh"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Cumasaigh uathshábháil"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Teachtaireacht"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr ""
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "GAN SAINMHÍNIÚ"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Roghnaigh"
+
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Tosú"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Lógó &tosaithe"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Leid an lae"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Taispeáin oibríochtaí"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Luchtaigh an tionscadal is déanaí"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Tosaigh tionscadal nua le:"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Bánaigh an Léaráid"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Gan Léaráid"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Léaráid Aicme"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Ginearálú"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Léaráid de Chás Úsáide"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Léaráid Chomhoibrithe"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Comhcheangal"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Léaráid Ghnímh"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Léaráid Chomhpháirte"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Léaráid Imlonnaithe"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Réamhshocrú"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Socruithe Aicme"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Taispeáin in&fheictheacht"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slais-Slais (//)"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Taispeáin tréithe"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slais-Réiltín (/**  */)"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Taispeáin oibríochtaí"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stíl:"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Taispeáin st&eiréitíopa"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Giniúint Chóid C++</p>"
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Taispeáin pacáiste"
-
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Scóp Tosaithe"
-
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Scóp réamhshocraithe oibríochta:"
-
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Giniúint Chóid"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Socruithe Giniúna Cóid"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "veicteoir"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Socruithe an Amharcáin Cóid"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Athróg</b>"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "teaghrán"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Iarratas (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Teaghrán</p>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Cosa&nta"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Liosta</p>"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Paraiméadair"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>domhanda?</i>"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Paraiméadar N&ua..."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "D'iontráil tú ainm neamhbhailí ar pharaiméadar."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Ainm aicme"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Ainm Neamhbhailí Paraiméadair"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Comhad ceanntáisc</p></i>"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Giniúint Tionscadail"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr ""
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Cruthaigh cáipéis tógála ANT"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter 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/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr ""
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hais (#)"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr ""
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Begin-End (=begin  =end)"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr ""
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Giniúint Chóid Ruby</p>"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Teanga"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Airí &Nua..."
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Fillteáin"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "&Oibríocht Nua..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Teimpléid"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Bra&bhsáil..."
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "T&eimpléad Nua..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "B&rabhsáil..."
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Tréithe Aonáin"
-
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Gníomh tosaigh"
-
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Gníomh deiridh"
-
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Cineál gnímh:"
-
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ainm an ghnímh:"
-
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Dathanna Giuirléidí"
-
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Airíonna Tréithe"
-
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Luach tosa&igh:"
-
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Poiblí"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Tá ainm neamhbhailí tréithe iontráilte agat."
-
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Ainm Neamhbhailí Tréithe"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Polasaí Forscríofa"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:214
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Roghnaigh Oibríocht"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Forscríobh"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Fi&afraigh díom"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "Léarái&dí"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Ú&sáid ainm difriúil"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Scagaire"
+#: 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/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Léaráid reatha"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formáidiú"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "G&ach léaráid"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Línte"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Roghnaigh léaráidí"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Cineál na léaráide"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Cineál eangaithe:"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Roghnú"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Comhoibriú"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Seicheamh"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Imlonnú"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Níl aon léaráid roghnaithe."
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Gan Eangú"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Roghanna Taispeána:"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Táb"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Spás"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: 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/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Roghanna Teanga"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr ""
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Treoraí Giniúna Cóid"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Oibríochtaí"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Roghnaigh Aicmí"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Infheictheacht"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&cáiste"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Aicmí Roghnaithe"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "T&réithe"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "St&eiréitíopa"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Aicmí Le Fáil"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr ""
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Stádas Giniúna Cóid"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Staid tosaigh"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Stádas Giniúna"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Staid deiridh"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Taispeáin bloic fholaithe"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Cineál staide:"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">ainm comhpháirte anseo</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Ainm na staide:"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Dath Giuirléidí"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Taispeáin cineál an bhloic"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "aicme_nua"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Dathanna"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Aicme Nua"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Cló:"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Tréithe Aicme"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Páipéar:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Oibríochtaí Aicme"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Roghnaithe:"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Gin"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Críochnaigh"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Gineadh an Cód"
-
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Níor Gineadh"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Téacs ineagarthóireachta:</p>"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Níor Gineadh Fós"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Níl an fillteán %1 ann. Ar mhaith leat é a chruthú anois?"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Súmáil:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Níl an fillteán aschurtha ann"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Cruthaigh Fillteán"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Taispeáin &greille"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ná Cruthaigh"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Léim &go greille"
 
-#: 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."
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Earráid Agus Fillteán á Chruthú"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Roghnaigh fillteán bailí le do thoil."
-
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Roghnaigh Fillteán Bailí Le Do Thoil"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Tá an Sprioc-Chomhad Ann Cheana"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Leithead líne:  "
 
-#: 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/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Cuir i bhfeidhm ar gach comhad atá fágtha"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "F&orscríobh"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Ná Gin Comhad"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Iolracht"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
 msgstr ""
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
 msgstr ""
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Iontráil téacs nua:"
-
-# --------------------------------------------------------------------
-#   Miscellaneous
-# --------------------------------------------------------------------
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "EARRÁID"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Easpórtáil"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Athraigh téacs"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Ailínigh Ar Chlé"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "Léarái&d"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Ailínigh Ar Dheis"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nua"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr ""
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Ta&ispeáin"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr ""
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Súmáil:"
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr ""
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Cód"
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr ""
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Teanga &Ghníomhach"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: 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 ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: 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 ""
 
-#: aligntoolbar.cpp:383
+#: tips:17
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:23
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Eochairfhocal in Áirithe"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
+#: 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 ""
 
-#: umlviewimageexporter.cpp:50
+#: tips:36
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:44
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Tá an comhad ann cheana"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "aisteoir_nua"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "cásúsáide_nua"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "pacáiste_nua"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "comhpháirt_nua"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nód_nua"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "déantán_nua"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "comhéadan_nua"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "cineálsonraí_nua"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "áirithe_nua"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "aonán_nua"
-
-#: model_utils.cpp:264
-msgid "new_folder"
+#: 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 ""
 
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "réad_nua"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Folamh"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argóint mhíchumtha"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Cineál anaithnid argóinte"
-
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Ainm neamhcheadaithe ar mhodh"
-
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Earráid gan sonrú"
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base 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:290
-msgid "Add Derived Class"
+#: 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:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
+#: 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:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Cuir Tréith Leis"
-
-#: 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 "new_stereotype"
diff --git a/tde-i18n-gl/messages/tdesdk/umbrello.po b/tde-i18n-gl/messages/tdesdk/umbrello.po
index fdbc0931758..1b2250d15a4 100644
--- a/tde-i18n-gl/messages/tdesdk/umbrello.po
+++ b/tde-i18n-gl/messages/tdesdk/umbrello.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-01-28 08:33+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -15,248 +15,207 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Xerador de código fonte autónomo do modelador UML Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Ficheiro a transformar"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "O ficheiro XSLT a usar"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Os autores do modelaro "
-"UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autores do modelador de UML Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "mvillarino"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "A exportar todas as vistas..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "mvillarino@users.sourceforge.net"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Aconteceron algúns erros ao exportar as imaxes:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Indique o nome da actividade"
 
-#: 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 "Ocorreu un problema ao guardar o ficheiro: %1"
+#: 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 "Insira o nome da nova actividade:"
 
-#: 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 "Erro ao guardar"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Aliñar á esquerda"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Obxecto"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Aliñar á dereita"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Mensaxe síncrona"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Aliñar ao cume"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Mensaxe asíncrona"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Aliñar ao fondo"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Asociación"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Aliñar ao centro na vertical"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Contido"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Aliñar ao centro na horizontal"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Enganche"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Aliñar distribuido na vertical"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Lenda"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Aliñar distribuido na horizontal"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Nota"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Para aliñar, terá que escoller polo menos 2 obxectos, por exemplo clases ou "
+"actores. Non poderá aliñar asociacións."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Caixa"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formato"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dependencia"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Xeneralización"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregación"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relación"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Asociación direccional"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementa (Xeneralización/Realización)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composición"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Caso de uso"
-
-#. 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 "Clase"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Estado inicial"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Estado final"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Ramificación/Unión"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Ramificar/Xuntar"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paquete"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Componente"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nó"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dependencia"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefacto"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Asociación"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interface"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Autoasociación"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tipo de dato"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Mensaxe de colaboración"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumeración"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Mensaxe de secuencia"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entidade"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Automensaxe de colaboración"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Historial profundo"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Automensaxe de secuencia"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Historial superficial"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Contido"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Xuntar"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composición"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Ramificar"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realización"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Unión"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Asociación unidireccional"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Escolla"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Enganche"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Transición de estado"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Transición de actividade"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Actividade"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Estado"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicidade"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Actividade final"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Indique a multiplicidade:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Actividade inicial"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nome da asociación"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mensaxe"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Indique o nome da asociación:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "NON DEFINIDO"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nome do papel"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Selección"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Indique o nome do papel:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Xa existe unha operación con eses nome e sinatura. Non pode engadila de novo."
+
+#: 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 "Ese nome non é válido."
+
+#: 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 "Nome non válido"
+
+#: 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 "Ese nome xa está a ser usado."
+
+#: 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 "Non é un nome único"
 
 #: 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."
+"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 ""
-"Polo menos un dos itens do portaretallos non puido ser apegado porque xa existe "
-"outro elemento co mesmo nome. Todos os outros itens foron apegados."
+"Polo menos un dos itens do portaretallos non puido ser apegado porque xa "
+"existe outro elemento co mesmo nome. Todos os outros itens foron apegados."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -275,10 +234,8 @@ msgid "Cannot Open File"
 msgstr "Non foi posíbel abrir o ficheiro"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Non é posíbel criar o cartafol:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Non é posíbel criar o cartafol:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -292,1353 +249,1523 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Non foi posíbel criar o cartafol"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Indique o nome do estado"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Opcións xerais"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Indique o nome do novo estado:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paquete é un espazo de nomes"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Inserir actividade"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Destrutores virtuais"
 
-#: 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 "Insira o nome da nova actividade:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Xerar construtores vacíos"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nova actividade"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Xerar métodos acesores"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Modelo UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "As operacións son \"inline\""
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Vista lóxica"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Os acesores son \"inline\""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Vista dos casos de uso"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Os acesores son públicos"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Vista de componentes"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "A importar o ficheiro: %1 Progreso: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Vista de implementación"
+#: 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 "Listo."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Modelo entidade relación"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "É o ámbito %1 un espazo de nomes ou unha clase?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipos de datos"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "A importación de C++ requere da súa axuda"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"O ficheiro actual foi modificado.\n"
-"Desexa guardalo?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Espazo de nomes"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "O ficheiro %1 non existe."
+#: 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 "Clase"
 
-#: 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 "Erro de leitura"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Erro interno"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "O ficheiro %1 parece estar corrompido."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Erro de sintaxe antes de \"%1\""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Non se atopou ningún ficheiro XMI no ficheiro comprimido %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Erro de procesamento antes de \"%1\""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Ocorreu un problema ao cargar o ficheiro extraído: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Ocorreu un problema ao cargar o ficheiro: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "espérase unha expresión"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Ocorreu un problema ao enviar o ficheiro: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Erro de sintaxe da declaración"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagrama de casos de uso"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "espérase un }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagrama de clase"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "espérase un espazo de nomes"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagrama de secuencia"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "espérase un {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagrama de colaboración"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Espérase o nome dun espazo de nomes"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagrama de estado"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "A declaración precisa un indicador de tipo"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagrama de actividade"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "espérase unha declaración"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagrama de componentes"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Espérase unha expresión constante"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagrama de implementación"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "espérase un \")\""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagrama entidade relación"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "Falta un }"
 
-#: 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 "Nome"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Espéranse os inicializadores do membro"
 
-#: 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 "Indique o nome:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Espérase o indicador da clase de base"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Ese nome non é válido para un diagrama."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Espérase unha cláusula de inicialización"
 
-#: 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 "Nome non válido"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Espérase un identificador"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Xa existe un diagrama con ese nome."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Espérase o identificador do tipo"
 
-#: 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 "Non é un nome único"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Espérase o nome da clase"
 
-#: 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 "Ese nome non é válido."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "espérase unha condición"
 
-#: 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 "Ese nome xa está a ser usado."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "espérase unha instrución"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"O nome que indicou non era único.\n"
-"É isto o que desexa?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "espérase a inicialización do \"for\""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nome non único"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "espérase un \"catch\""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Nome do uso"
+#: 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 "&Propiedades"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Indique o novo Nome"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Actividade inicial"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Está seguro de que desexa eliminar o diagrama %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Actividade final"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Borrar o diagrama"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Ramificación/Unión"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "A configurar o documento..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Ramificar/Xuntar"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "A resolver as referencias a obxectos..."
+#: 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 "Xeral"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "A cargar os elementos de UML..."
+#: 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 "Propiedades xerais"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "A cargar os diagramas..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tipo da actividade:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Diagrama-uml-kde"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nome da actividade:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autoguardar%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 "Documentación"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Externalizar o cartafol"
+#: 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 "Tipo de letra:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Indicar o nome do modelo"
+#: 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 "Configuración dos Tipos de Letra"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Insira o novo nome do modelo:"
+#: 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 "Cor"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vistas"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Cores dos widgets"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"O nome que indicou non era válido.\n"
-"O proceso de criazón foi cancelado."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Actividades"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nome non válido"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nova actividade..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"O nome que indicou non é único!\n"
-"O proceso de criazón foi cancelado."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Borrar o enganche"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Criazón cancelada"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Mudar o nome"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "A cargar a vista en lista..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nova actividade"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "O cartafol debe estar vacío antes de poder ser borrado."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nova actividade"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Cartafol non vacío"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Mudar o nome da actividade"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Xa existe unha operación con eses nome e sinatura. Non pode engadila de novo."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Insira o novo nome da actividade:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Indique o nome da actividade"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "novo estado"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipo:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Xeneralización"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Asociacións"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Autoasociación"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Propiedades da asociación"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Mensaxe de colaboración"
+#: 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 "Configuración xeral"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Mensaxe de secuencia"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Papeis"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Automensaxe de colaboración"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Configuración dos papeis"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Automensaxe de secuencia"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Tipo de letra da asociación"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realización"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Propiedades do Papel A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Asociación unidireccional"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Propiedades do Papel B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportar"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Visibilidade do Papel A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagrama"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Visibilidade do Papel B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Novo"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Variabilidade do Papel A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "M&ostrar"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Variabilidade do Papel B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Código fonte"
+msgid "Rolename:"
+msgstr "Nome do papel:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Linguaxe activa"
+msgid "Multiplicity:"
+msgstr "Multiplicidade:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentación"
+msgid "Public"
+msgstr "Público"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Barra-Barra (//)"
+msgid "Private"
+msgstr "Privado"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Barra-Estrela (/** */)"
+msgid "Protected"
+msgstr "Protexido"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Estilo:"
+msgid "Implementation"
+msgstr "Implementación"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Xerazón de fontes en C++</p>"
+msgid "Changeable"
+msgstr "Modificábel"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Xeral"
+msgid "Frozen"
+msgstr "Conxelado"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Xerazón do corpo dos métodos"
+msgid "Add only"
+msgstr "Só para engadir"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Utilizar o seguinte nas clases das fontes xeradas:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nome da clase:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nome do actor:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nome do paquete:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variábel</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nome do caso de uso:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nome da interface:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nome da componente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nome do artefacto:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Nome da enumeración:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nome do tipo de dato:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nome da entidade:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Nome do e&stereotipo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Nome do &paquete:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nome da clase"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Clase a&bstracta"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\" >Ficheiro de definicións</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Caso de uso a&bstracto"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Xerazón do proxecto"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Executábel"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Cría un documento ANT de compilación"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Debuxar como"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Xerar automaticamente os métodos"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Por omisión"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Métodos construtores vacíos"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Preenc&hemento:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Métodos acesores de asociacións"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&lioteca"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Métodos acesores aos atributos"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Táboa"
 
-#. 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 "Público"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibilidade"
 
-#. 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 "Privado"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&úblico"
 
-#. 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 "Protexido"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivado"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Do obxecto pai"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&texido"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Ámbito por omisión dos acesores aos atributos:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentazón"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Ámbito por omisión dos campos de asociación:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nome da clase:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Do papel pai"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nome da instancia:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Xerazón de código fonte en Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Debuxar como actor"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Cardinal (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Instancia múltipla"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Inicio-Fin (=begin =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Mostrar a destruición"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Xerazón de código fonte en Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nome da componente:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nome do nó:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nome do estereotipo:"
+
+#: 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 ""
+"O nome que escolleu\n"
+"xa está a ser usado.\n"
+"O nome foi reinicializado."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "O Nome non é único"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributos"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ovo atributo..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacións"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nova op&eración..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Modelos"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Novo mod&elo..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Literais enumerados"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Novo lit&eral enumerado..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributos da entidade"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Novo atributo da &entidade..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Borrar o enganche"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Propiedades"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Mostrar"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Operacións"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibilidade"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Sinatura das o&peracións"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&quete"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributos"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Estereot&ipo"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Sinatura dos atr&ibutos"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Debuxar como un círculo"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Visualizazón"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opcións de visualización"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Configuración dos atributos"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Configuración da operación"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Configuración dos modelos"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Configuración dos literais enumerados"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Configuración dos atributos da entidade"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Contido"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Configuración dos contidos"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Asociacións da clase"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_clase"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nova clase"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributos da clase"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operacións da clase"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Opcións de xerazón de fontes"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Linguaxe"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Xerar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Cartafoles"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Finalizar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Escribir todos os ficheiros xerados no cartafol:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Fontes xeradas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Escoller..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Non xerado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Es&coller..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Aínda non xerado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Incluír os ficheiros de definicións no cartafol:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "O cartafol %1 non existe. Desexa crialo agora?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Os ficheiros criados polo xerador de código fonte serán escritos neste cartafol"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "O cartafol de saída non existe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Criar un cartafol"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Non criar"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Os ficheiros neste cartafol serán usados como ficheiros de definicións nas "
-"fontes xeradas"
+"Non foi posíbel criar o cartafol.\n"
+"Comprobe que ten aceso de escrita ao cartafol que o contén ou escolla outro "
+"cartafol válido."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Política de sobrescritura"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Erro ao criar o cartafol"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Por favor escolla un cartafol válido."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Se xa existe un ficheiro co mesmo nome que\n"
-"un dos que o xerador de código quer usar:"
+"O cartafol de saída xa existe, pero non é posíbel escribir nel.\n"
+"Por favor modifique os permisos ou escolla outro cartafol."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "S&obrescribir"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Erro ao escribir no cartafol de saída"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr ""
-"Sobrescribir os ficheiros xa existentes se estivesen no cartafol de destino"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 non parece ser un cartafol. Por favor escolla un cartafol válido."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Per&guntar"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Escolla un cartafol válido"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Se xa existe un ficheiro co mesmo nome, pregunta o que debe facer"
+msgid "Code Viewer"
+msgstr "Visor de fontes"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Usar un nome diferente"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\" >Non hai nengunha opción disponíbel.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Se xa existe un ficheiro no cartafol de destino, escoller un nome diferente  "
-"engadindo un sufixo ao nome do ficheiro"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formato"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Liñas"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Diagrama a&ctual"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Estilo de fin de liña:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Todos os di&agramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Tipo de sangrado:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Seleccionar os diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Cantidade de sangrado:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tipo de diagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selección"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Caso de uso"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Colaboración"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Sen sangrar"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Secuencia"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulación"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Estado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Espazo"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Componente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Verbosidade dos comentarios"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Implementación"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Diagrama-uml-kde"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Non escolleu ningún diagrama."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "O formato ao que serán exportadas as imaxes"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Documentación da nota"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "O Ficheiro de destino xa existe"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Escribir os comentarios das &seccións\n"
-"aínda que estas estexan vacías"
+"O ficheiro %1 xa existe en %2.\n"
+"\n"
+"Umbrello pode sobrescribir o ficheiro, xerar un nome\n"
+"semellante ou non xerar este ficheiro."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Aplicar para todos os ficheiros restantes"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "S&obrescribir"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Xerar un nome de ficheiro semellante"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Non xerar o ficheiro"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Propiedades do parámetro"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipo:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nome:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Valor &inicial:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Dirección de paso"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Escribir comentarios para indicar as diferentes seccións (\"public\", "
-"\"private\", etc...) da clase, aínda que estexan vacías"
+"\"in\" é un parámetro só de leitura, \"out\"é un parámetro só de escrita e "
+"\"inout\" é un parámetro para leitura e escrita."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Escri&bir comentarios de documentación aínda que estexa vacío"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Itens contidos"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Escribir os comentarios de documentación para as clases e &métodos aínda que "
-"estes estexan vacíos"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Seleccione a operación"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Opcións da linguaxe"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Número de secuencia:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Asistente de xerazón de código fonte"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operación da clase:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Escoller as clases"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Operación personalizada:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Configuración de Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interface co usuario"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Configuración da interface co usuario"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Cor da liña:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Cor por o&misión"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Cor de preenchemento:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "&Cor por omisión"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Ancho da liña:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "A&ncho por omisión"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Usar a cor de preenchemento"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Sitúe na lista da dereita todas as clases\n"
-"para as cais queira xerar código fonte"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Engadir a clase para a xerazón de código"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Activar o desfacer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Clases escollidas"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Utilizar diagramas paxinados"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Borrar a clase da xerazón de código"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Utilizar os novos xeradores de C++/Jaba/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Clases disponíbeis"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Usar liñas de asociación angulares"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Estado da xerazón de código fonte"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Guardado automático"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Prema no botón Xerazón para iniciar a xerazón de código"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Activar o &guardado automático"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Estado da xerazón"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Escolla o intervalo entre guardados automáticos (min):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Visor de fontes"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Sufixo dos guardados automáticos:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Mostrar os bloques acochados"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>O ficheiro do guardado automático será guardado en ~/autosave.xmi se "
+"o guardado acontece antes de que o guarde manualmente.</p><p>Se xa o "
+"guardou, o ficheiro guardado automaticamente estará no mesmo cartafol que o "
+"ficheiro e terá o mesmo nome que o ficherio, seguido polo sufixo "
+"especificado.</p><p>Se o sufixo é o mesmo que o do ficheiro que guardou, o "
+"guardado automático sobrescreberá automaticamente o seu ficheiro.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">aquí vai o nome do componente</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Arranque"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Mostrar o tipo do bloque"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logotipo &inicial"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Cores"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Axuda do día"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Tipo de letra:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Cargar o ú&ltimo proxecto"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papel:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Iniciar un proxecto novo con:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Escollido:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Ningún diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Bloque de obxecto UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagrama de clases"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Bloque acochado:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagrama de casos de uso"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"center\">Texto non editábel:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagrama de secuencia"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Texto editábel:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagrama de colaboración"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Propiedades do diagrama"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagrama de estados"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nome:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagrama de actividades"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Ampliación:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagrama de componentes"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagrama de implementación"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Configuración da clase"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Mostrar a &visibilidade"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Mostrar os atributos"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Mostrar as operacións"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Mostrar o estereo&tipo"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Mostrar a sinatura dos atributos"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Mostrar o paquete"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Mostrar a sinatura das operacións"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Mostrar a &grella"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Ámbito inicial"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Axus&tar á grella"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Ámbito por omisión dos atributos:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Axustar tamaño dos componentes"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Ámbito por omisión das operacións:"
 
-#. 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."
-msgstr ""
-"Axusta o tamaño dos componentes para un múltiplo da luz da grella.\n"
-"Se \"Axustar á grella\" estivese activo os componentes ficarán sempre aliñados "
-"coa grella polos 4 lados."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Xerazón de fontes"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Luz da grella: "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Configuración da xerazón de fontes"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Configuración do visor de fontes"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Estado inicial"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Ancho da liña: "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Estado final"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exportar todas as vistas"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tipo do estado:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Cartafol onde guardar os diagramas:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nome do estado:"
 
-#. 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"
-msgstr "O cartafol base onde se irán guardar as imaxes"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Cor do widget"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Tipo de &imaxe:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Propiedades do atributo"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "O formato ao que serán exportadas as imaxes"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Ámbito do cla&sificador (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Usar carta&foles"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Público"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Cria no cartafol de destino a mesma estrutura en árbore usada\n"
-"no documento para guardar as vistas"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&exido"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementazón"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Indicou un nome de atributo non válido."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nome do atributo non válido"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"As vistas son guardadas en cartafoles no documento. A mesma estrutura en árbore "
-"usada no documento pode ser criada no cartafol base con esta opción.\n"
-"No cartafol base só se criarán os cartafoles criados polo usuario (a vista "
-"lóxica, vista de casos de uso e demais non serán criados)."
+"O nome que escolleu para o atributo xa está a ser usado nesta operación."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Propiedades do papel"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Nome do atributo non único"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Nome do papel:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Propiedades do atributo da entidade"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicidade:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Valor por omisión:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Variabilidade do papel"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Lonxitude/Valores:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Só para engadir"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "Incremento &automático"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Conxelado"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Permitir &nulo"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Modificábel"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributos:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Visibilidade do papel"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexación"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementación"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Ningún"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Benvido a Umbrello.</p>\n"
-"<p>Os diagramas UML permítenlle deseñar e documentar sóftware orientado a "
-"obxectos. <a href=\"help:/umbrello\">O Manual de Umbrello</a> "
-"é unha boa introdución ao uso de UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primario"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Benvido a Umbrello 1.5. As novidades desta versión son as clases de "
-"asociación, a xerazón de código en Ruby, a externalización de cartafoles, a "
-"capacidade de mudar interfaces para clases, entre outras.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Índ&ice"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Os diagramas en páxinas e os cartafoles externalizados son mutuamente "
-"excluintes. Se necesita de cartafoles externos, desinale a opción &quot;Usar "
-"diagramas en páxinas&quot; na Configuración xeral.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Único"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Non poderá mudar o tamaño da maioría dos itens dos diagramas; eles mudarán o "
-"seu tamaño para se axustar ao seu contido.\n"
-"Pode mudar o tamaño das caixas, notas e mensaxes dos diagramas de secuencia, "
-"abondando con premer e arrastrar o cadro vermello.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Indicou un nome de atributo de entidade non válido."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Se quixer engadir unha clase xa existente a un diagrama, abonda arrastrar o "
-"seu ícone desde a vista en árbore.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nome do atributo da entidade non válido"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>O axente de refactorizazón de Umbrello permítelle mover operacións entre "
-"unha clase e as súas clases derivadas ou de base.\n"
-"Prema co botón dereito nunha clase para abrir o axente de refactorización.</p>\n"
+"O nome que escolleu para o atributo da entidade xa está a ser usado nesta "
+"operación."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Os obxectos dos diagramas de secuencia poden ter unha opción de destrución e "
-"poden ser mostrados como actores. Faga duplo-click nun para\n"
-"mostrar o diálogo de propiedades.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Nome do atributo da entidade non único"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>As mensaxes dos diagramas de secuencia poden actuar como construtores. Prema "
-"na caixa do obxecto (en vez da liña vertical) para convertelo nun "
-"construtor.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Propiedades da operación"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Os diagramas de secuencia soportan mensaxes para si mesmos. Prema de novo na "
-"mesma liña vertical para criar unha mensaxe para si.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Operación &abstracta"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Se ao cargar un ficheiro alleo, non fose mostrado nada na lista, probe a "
-"guardar o modelo con outro nome,\n"
-"pechalo e volver a cargar o ficheiro guardado. Normalmente  a lista será entón "
-"preenchida correctamente.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "Pes&quisa (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Cortar e apegar tamén exportarán a imaxe para o porta-retallos en PNG, a cal "
-"poderá ser pegada en KWord e noutras aplicacións.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parámetros"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>As asociacións non teñen que formar liñas rectar, se preme dúas veces nunha, "
-"criará un punto móbil.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&vo parámetro..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Pode activar o guardado automático no diálogo de configuración de "
-"Umbrello.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Indicou un nome de parámetro non válido."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Vota en falta algunha funcionalidade en Umbrello? Díganos cal é.\n"
-"Pode ou engadila á base de datos de erros mediante Comunicar un Erro no menú\n"
-"de Axuda ou mediante un correo para a lista de correo uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nome de parámetro non válido"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Pode borrar todos os obxectos escollidos se preme en Supr ou Borrar.</p>\n"
+"O nome que escolleu para o parámetro\n"
+"xa está a ser usado nesta operación."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Se descobriu un erro en Umbrello, fáganolo saber.\n"
-"Pode comunicar os erros coa ferramenta de Comunicar un Erro no menú de "
-"Axuda.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Nome de parámetro non único"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Se preme na tecla Escape cambiará a ferramenta actual para a de selección.\n"
-"Coa tecla de borrar voltará para a ferramenta usada anteriormente.</p>\n"
+"O nome que escolleu para o parámetro xa está a ser usado nesta operación."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Indicou un nome de operación non válido."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nome de operación non válido"
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Xa existe unha operación con esa sinatura en %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Escolla un nome ou lista de parámetros diferente."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Propiedades do papel"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Propiedades do modelo"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Foi indicado un nome de modelo non válido."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nome do modelo non válido"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Pode seleccionar todos os obxectos premendo Ctrl-A.</p>\n"
+"O nome que escolleu para o parámetro do modelo xa está a ser usado nesta "
+"operación."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Nome do modelo non único"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opcións de visualización das clases"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Cores dos diagramas"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "O nome que inseriu non é válido."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "O nome que indicou non é único."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nome non único"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Liña:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Preenc&hemento:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Pr&edefinición"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Usar o preenchemento"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "A exportar todas as vistas..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Aconteceron algúns erros ao exportar as imaxes:"
+
+#: 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 "Ocorreu un problema ao guardar o ficheiro: %1"
 
-#: tips.txt:108
+#: 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 "Erro ao guardar"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Xerador de código fonte autónomo do modelador UML Umbrello"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Ficheiro a transformar"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "O ficheiro XSLT a usar"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Pode criar e configurar unha nova clase usando o Asistente de novas clases "
-"no menú código.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Os autores do modelaro "
+"UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autores do modelador de UML Umbrello"
+
+#: 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 "Nome"
+
+#: 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 "Indique o nome:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Indique o nome da operación:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Insira o novo texto:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERRO"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Mudar o texto"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "O ficheiro do cartafol %1 non existe."
+
+#: 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 "Erro de leitura"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "O ficheiro do cartafol %1 non pode ser aberto."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1692,6 +1819,10 @@ msgstr "Nova operación..."
 msgid "Select Operation..."
 msgstr "Escolla a operación..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Mudar o texto..."
@@ -1743,6 +1874,19 @@ msgstr "Novo"
 msgid "Rename..."
 msgstr "Mudar o nome..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Erro de apegar"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Cor da liña..."
@@ -1771,14 +1915,26 @@ msgstr "Internalizar o cartafol"
 msgid "Import Classes..."
 msgstr "Importar clases..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paquete"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Subsistema"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefacto"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagrama de componentes..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nó"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagrama de Implementación..."
@@ -1787,10 +1943,18 @@ msgstr "Diagrama de Implementación..."
 msgid "Folder"
 msgstr "Cartafol"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entidade"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagrama de relacións entre entidades..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Actor"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagrama de casos de uso..."
@@ -1827,6 +1991,18 @@ msgstr "Novo atributo da entidade..."
 msgid "Export as Picture..."
 msgstr "Exportar como unha Imaxe..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interface"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tipo de dato"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumeración"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagrama de clases..."
@@ -1847,26 +2023,10 @@ msgstr "Diagrama de secuencia..."
 msgid "Collaboration Diagram..."
 msgstr "Diagrama de colaboración..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributos"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacións"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Só público"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibilidade"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Sinatura da operación"
@@ -1879,11 +2039,6 @@ msgstr "Sinatura do atributo"
 msgid "Stereotype"
 msgstr "Estereotipo"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Mostrar"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atributo..."
@@ -1908,14 +2063,6 @@ msgstr "Cor de recheo..."
 msgid "Use Fill Color"
 msgstr "Usar cor de recheo"
 
-#: 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 "Cor"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Actor..."
@@ -1944,10 +2091,26 @@ msgstr "Enumeración..."
 msgid "Package..."
 msgstr "Paquete..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Estado inicial"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Estado final"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Estado..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Actividade inicial"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Actividade final"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Subsistema..."
@@ -1992,6 +2155,14 @@ msgstr "Borrar o enganche"
 msgid "Change Association Name..."
 msgstr "Mudar o nome da asociación..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Limpar o diagrama"
@@ -2026,8 +2197,8 @@ msgstr "o cartafol do ficheiro"
 
 #: 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 ""
 "manter a estrutura en árbore usada para guardas as vistas no documento no "
 "cartafol de destino"
@@ -2037,191 +2208,95 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 Os autores do modelador de UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Utilización incorrecta das asociacións."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Erro de asociación"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "O ficheiro do cartafol %1 non existe."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "O ficheiro do cartafol %1 non pode ser aberto."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "mvillarino"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "mvillarino@users.sourceforge.net"
-
-#: 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 "Listo."
-
-#: 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 ""
-"Manteña premida a tecla de maiúsculas ou control para mover no eixo X. Manteña "
-"as dúas á vez para mover no eixo Y. Prema co botón dereito para cancelar o "
-"movimento."
-
-#: 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 ""
-"Manteña premida a tecla de maiúsculas ou control para mover no eixo X. Manteña "
-"as dúas á vez para mover no eixo Y. Prema co botón dereito para cancelar a "
-"mudanza de tamaño."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "É o ámbito %1 un espazo de nomes ou unha clase?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "A importación de C++ requere da súa axuda"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Espazo de nomes"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "A importar o ficheiro: %1 Progreso: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Erro interno"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Erro de sintaxe antes de \"%1\""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Erro de procesamento antes de \"%1\""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "actor_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "espérase unha expresión"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "casoDeUso_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Erro de sintaxe da declaración"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "paquete_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "espérase un }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "componente_nova"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "espérase un espazo de nomes"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nó_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "espérase un {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "artefacto_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Espérase o nome dun espazo de nomes"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "interface_nova"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "A declaración precisa un indicador de tipo"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "tipodedatos_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "espérase unha declaración"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "enumeración_nova"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Espérase unha expresión constante"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "entidade_nova"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "espérase un \")\""
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "cartafol_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "Falta un }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "asociación_nova"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Espéranse os inicializadores do membro"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "obxecto_novo"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Espérase o indicador da clase de base"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Espérase unha cláusula de inicialización"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Vacío"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Espérase un identificador"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argumento mal formado"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Espérase o identificador do tipo"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tipo de argumento descoñecido"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Espérase o nome da clase"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nome de método ilegal"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "espérase unha condición"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tipo de retorno descoñecido"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "espérase unha instrución"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Erro non especificado"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "espérase a inicialización do \"for\""
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Esta palabra chave está reservada na linguaxe indicada no xerador de fontes."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "espérase un \"catch\""
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Palabra chave reservada"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2235,108 +2310,66 @@ msgstr "Escriba o nome do obxecto:"
 msgid "new_parameter"
 msgstr "parámetro_novo"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Opcións xerais"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paquete é un espazo de nomes"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Destrutores virtuais"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Xerar construtores vacíos"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Xerar métodos acesores"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "As operacións son \"inline\""
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Os acesores son \"inline\""
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Os acesores son públicos"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagrama: %2 Páxina %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Indicar o nome do diagrama"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Engadir unha clase base"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Escriba o novo nome do diagrama:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Engadir unha clase derivada"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Está a piques de eliminar o diagrama enteiro.\n"
-"\n"
-"Está seguro de que o desexa facer?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Engadir unha operación"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Borrar o diagrama?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Engadir un atributo"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Mudanza de nome cancelada"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Engadir unha interface base"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Mudar o nome dun elemento no tipo de vista en lista %1 aínda non está  "
-"implementado."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Engadir unha interface derivada"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Función non implementada"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Clasificadores base"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"O nome que indicou non é válido.\n"
-"O proceso de mudar o nome foi cancelado."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Clasificadores derivados"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "asociación_nova"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Indique o nome do estado"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "novo_atributo"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Indique o nome do novo estado:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novo_modelo"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Inserir actividade"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operación"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Utilización incorrecta das asociacións."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "novo_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Erro de asociación"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_campo"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "novo estado"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2490,11 +2523,6 @@ msgstr "&Exportar como unha imaxe..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Exportar &todos os diagramas como imaxes..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Propiedades"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Barra de A&mpliación"
@@ -2579,21 +2607,28 @@ msgstr "&Documentación"
 msgid "Opening file..."
 msgstr "A abrir o ficheiro..."
 
+#: 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 "A criar un documento novo..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Todos os ficheiros soportados (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Todos os ficheiros soportados (*.xmi, *."
+"xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Ficheiros XMI sen comprimir (*.xmi)\n"
 "*.xmi.tgz|GFicheiros XMI comprimidos con gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Ficheiros XMI comprimidos con Bzip2 (*.xmi.tar.bz2)\n"
@@ -2623,6 +2658,10 @@ msgstr ""
 "*.xmi.tar.bz2|Ficheiro XMI comrpimido con Bzip2\n"
 "*|Todos os ficheiros"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2631,6 +2670,10 @@ msgstr ""
 "O ficheiro %1 xa existe!\n"
 "Desexa sobrescribilo?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Sobrescribir"
@@ -2666,8 +2709,8 @@ msgstr "A inserir o contido do portaretallos..."
 
 #: 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 ""
 "Umbrello non conseguiu apegar o contido do portaretallos. Pode ser que os "
 "obxectos no portaretallos sexan dun tipo non válido para seren apegados aquí."
@@ -2725,1267 +2768,1324 @@ msgstr "Todos os ficheiros"
 msgid "Select Code to Import"
 msgstr "Escolla as fontes a importar"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nome da clase:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nome do actor:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "novo_atributo"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nome do paquete:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novo_modelo"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nome do caso de uso:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operación"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nome da interface:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "novo_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nome da componente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_campo"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nome do artefacto:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Modelo UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Nome da enumeración:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Vista lóxica"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nome do tipo de dato:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Vista dos casos de uso"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nome da entidade:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Vista de componentes"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Nome do e&stereotipo:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Vista de implementación"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Nome do &paquete:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Modelo entidade relación"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Clase a&bstracta"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipos de datos"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Caso de uso a&bstracto"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"O ficheiro actual foi modificado.\n"
+"Desexa guardalo?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Executábel"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "O ficheiro %1 non existe."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Debuxar como"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "O ficheiro %1 parece estar corrompido."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Por omisión"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Non se atopou ningún ficheiro XMI no ficheiro comprimido %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&lioteca"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Ocorreu un problema ao cargar o ficheiro extraído: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Táboa"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Ocorreu un problema ao cargar o ficheiro: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&úblico"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Ocorreu un problema ao enviar o ficheiro: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivado"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagrama de casos de uso"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&texido"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagrama de clase"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentazón"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagrama de secuencia"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nome da clase:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagrama de colaboración"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nome da instancia:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagrama de estado"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Debuxar como actor"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagrama de actividade"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Instancia múltipla"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagrama de componentes"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Mostrar a destruición"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagrama de implementación"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nome da componente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagrama entidade relación"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nome do nó:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Ese nome non é válido para un diagrama."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nome do estereotipo:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Xa existe un diagrama con ese nome."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"O nome que escolleu\n"
-"xa está a ser usado.\n"
-"O nome foi reinicializado."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "O Nome non é único"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Liña:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Preenc&hemento:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Pr&edefinición"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Usar o preenchemento"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Actividades"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nova actividade..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Mudar o nome"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nova actividade"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Mudar o nome da actividade"
+"O nome que indicou non era único.\n"
+"É isto o que desexa?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Insira o novo nome da actividade:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Nome do uso"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Propiedades da asociación"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Indique o novo Nome"
 
-#: 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 "Configuración xeral"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Está seguro de que desexa eliminar o diagrama %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Papeis"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Borrar o diagrama"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Configuración dos papeis"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "A configurar o documento..."
 
-#: 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 "Configuración dos Tipos de Letra"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "A resolver as referencias a obxectos..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Tipo de letra da asociación"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "A cargar os elementos de UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Propiedades do modelo"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "A cargar os diagramas..."
 
-#: 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 "Propiedades xerais"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autoguardar%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipo:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Externalizar o cartafol"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nome:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Indicar o nome do modelo"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Foi indicado un nome de modelo non válido."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Insira o novo nome do modelo:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nome do modelo non válido"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vistas"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"O nome que escolleu para o parámetro do modelo xa está a ser usado nesta "
-"operación."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Nome do modelo non único"
+"O nome que indicou non era válido.\n"
+"O proceso de criazón foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Propiedades do atributo da entidade"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nome non válido"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Valor por omisión:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"O nome que indicou non é único!\n"
+"O proceso de criazón foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Lonxitude/Valores:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Criazón cancelada"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "Incremento &automático"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "A cargar a vista en lista..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Permitir &nulo"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "O cartafol debe estar vacío antes de poder ser borrado."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributos:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Cartafol non vacío"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexación"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Mudanza de nome cancelada"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Ningún"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Mudar o nome dun elemento no tipo de vista en lista %1 aínda non está  "
+"implementado."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primario"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Función non implementada"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Índ&ice"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"O nome que indicou non é válido.\n"
+"O proceso de mudar o nome foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Único"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagrama: %2 Páxina %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Indicou un nome de atributo de entidade non válido."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Indicar o nome do diagrama"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nome do atributo da entidade non válido"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Escriba o novo nome do diagrama:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"O nome que escolleu para o atributo da entidade xa está a ser usado nesta "
-"operación."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Nome do atributo da entidade non único"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Visualizazón"
+"Está a piques de eliminar o diagrama enteiro.\n"
+"\n"
+"Está seguro de que o desexa facer?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opcións de visualización das clases"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Borrar o diagrama?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Cores dos diagramas"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "A exportar a vista..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "O nome que inseriu non é válido."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Aconteceu un erro ao exportar a imaxe:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "O nome que indicou non é único."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"O ficheiro escollido %1 xa existe.\n"
+"Desexa sobrescribilo?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipo:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "O ficheiro xa existe"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Configuración de Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Non é posíbel criar o cartafol: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interface co usuario"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Non é posíbel guardar un diagrama vacío"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Configuración da interface co usuario"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Aconteceu un problema ao guardar o diagrama en %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Cor da liña:"
+#: 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 ""
+"Manteña premida a tecla de maiúsculas ou control para mover no eixo X. "
+"Manteña as dúas á vez para mover no eixo Y. Prema co botón dereito para "
+"cancelar o movimento."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Cor por o&misión"
+#: 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 ""
+"Manteña premida a tecla de maiúsculas ou control para mover no eixo X. "
+"Manteña as dúas á vez para mover no eixo Y. Prema co botón dereito para "
+"cancelar a mudanza de tamaño."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Cor de preenchemento:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Obxecto"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "&Cor por omisión"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Mensaxe síncrona"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Ancho da liña:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Mensaxe asíncrona"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "A&ncho por omisión"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Lenda"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Usar a cor de preenchemento"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Nota"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Activar o desfacer"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Caixa"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Utilizar diagramas paxinados"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relación"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Utilizar os novos xeradores de C++/Jaba/Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Asociación direccional"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Usar liñas de asociación angulares"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementa (Xeneralización/Realización)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Guardado automático"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Historial profundo"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Activar o &guardado automático"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Historial superficial"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Escolla o intervalo entre guardados automáticos (min):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Xuntar"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Sufixo dos guardados automáticos:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Ramificar"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>O ficheiro do guardado automático será guardado en ~/autosave.xmi se o "
-"guardado acontece antes de que o guarde manualmente.</p>"
-"<p>Se xa o guardou, o ficheiro guardado automaticamente estará no mesmo "
-"cartafol que o ficheiro e terá o mesmo nome que o ficherio, seguido polo sufixo "
-"especificado.</p>"
-"<p>Se o sufixo é o mesmo que o do ficheiro que guardou, o guardado automático "
-"sobrescreberá automaticamente o seu ficheiro.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Unión"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Arranque"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Escolla"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logotipo &inicial"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Transición de actividade"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Axuda do día"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mensaxe"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Cargar o ú&ltimo proxecto"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "NON DEFINIDO"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Iniciar un proxecto novo con:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Selección"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Ningún diagrama"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagrama de clases"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagrama de casos de uso"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagrama de secuencia"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagrama de colaboración"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Mostrar as operacións"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagrama de estados"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagrama de actividades"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Limpar o diagrama"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagrama de componentes"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagrama de implementación"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Xeneralización"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Configuración da clase"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Mostrar a &visibilidade"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Mostrar os atributos"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nome da asociación"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Mostrar as operacións"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Mostrar o estereo&tipo"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Mostrar a sinatura dos atributos"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Mostrar o paquete"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Por omisión"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Ámbito inicial"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Ámbito por omisión dos atributos:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Barra-Barra (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Ámbito por omisión das operacións:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Barra-Estrela (/** */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Xerazón de fontes"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Estilo:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Configuración da xerazón de fontes"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Xerazón de fontes en C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Configuración do visor de fontes"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Xerazón do corpo dos métodos"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Propiedades da operación"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Utilizar o seguinte nas clases das fontes xeradas:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Operación &abstracta"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Ámbito do cla&sificador (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "Pes&quisa (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variábel</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&exido"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementazón"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parámetros"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&vo parámetro..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Indicou un nome de parámetro non válido."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nome de parámetro non válido"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"O nome que escolleu para o parámetro\n"
-"xa está a ser usado nesta operación."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Nome de parámetro non único"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"O nome que escolleu para o parámetro xa está a ser usado nesta operación."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nome da clase"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Indicou un nome de operación non válido."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\" >Ficheiro de definicións</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nome de operación non válido"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Xerazón do proxecto"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Xa existe unha operación con esa sinatura en %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Cría un documento ANT de compilación"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Escolla un nome ou lista de parámetros diferente."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Xerar automaticamente os métodos"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Propiedades do Papel A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Métodos construtores vacíos"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Propiedades do Papel B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Métodos acesores de asociacións"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Visibilidade do Papel A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Métodos acesores aos atributos"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Visibilidade do Papel B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Do obxecto pai"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Variabilidade do Papel A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Ámbito por omisión dos acesores aos atributos:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Variabilidade do Papel B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Ámbito por omisión dos campos de asociación:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Itens contidos"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Do papel pai"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Documentación da nota"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Xerazón de código fonte en Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ovo atributo..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Cardinal (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nova op&eración..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Inicio-Fin (=begin =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Modelos"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Xerazón de código fonte en Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Novo mod&elo..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Linguaxe"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Literais enumerados"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Cartafoles"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Novo lit&eral enumerado..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Escribir todos os ficheiros xerados no cartafol:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributos da entidade"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Escoller..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Novo atributo da &entidade..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Es&coller..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Actividade inicial"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Incluír os ficheiros de definicións no cartafol:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Actividade final"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Os ficheiros criados polo xerador de código fonte serán escritos neste "
+"cartafol"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tipo da actividade:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Os ficheiros neste cartafol serán usados como ficheiros de definicións nas "
+"fontes xeradas"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nome da actividade:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Política de sobrescritura"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Cores dos widgets"
+#: 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 ""
+"Se xa existe un ficheiro co mesmo nome que\n"
+"un dos que o xerador de código quer usar:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Propiedades do atributo"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "S&obrescribir"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Valor &inicial:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
+"Sobrescribir os ficheiros xa existentes se estivesen no cartafol de destino"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Público"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Per&guntar"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Indicou un nome de atributo non válido."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Se xa existe un ficheiro co mesmo nome, pregunta o que debe facer"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nome do atributo non válido"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Usar un nome diferente"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"O nome que escolleu para o atributo xa está a ser usado nesta operación."
+"Se xa existe un ficheiro no cartafol de destino, escoller un nome diferente  "
+"engadindo un sufixo ao nome do ficheiro"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Nome do atributo non único"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formato"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Seleccione a operación"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Liñas"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Número de secuencia:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Estilo de fin de liña:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operación da clase:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Tipo de sangrado:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Operación personalizada:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Cantidade de sangrado:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramas"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtro"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Diagrama a&ctual"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Todos os di&agramas"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Sen sangrar"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Seleccionar os diagramas"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulación"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tipo de diagrama"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Espazo"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selección"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Verbosidade dos comentarios"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Colaboración"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Escribir os comentarios das &seccións\n"
+"aínda que estas estexan vacías"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Secuencia"
+#: 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 ""
+"Escribir comentarios para indicar as diferentes seccións (\"public\", "
+"\"private\", etc...) da clase, aínda que estexan vacías"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Implementación"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Escri&bir comentarios de documentación aínda que estexa vacío"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Non escolleu ningún diagrama."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Escribir os comentarios de documentación para as clases e &métodos aínda que "
+"estes estexan vacíos"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opcións de visualización"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Opcións da linguaxe"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Configuración dos atributos"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Asistente de xerazón de código fonte"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Configuración da operación"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Escoller as clases"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Configuración dos modelos"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Sitúe na lista da dereita todas as clases\n"
+"para as cais queira xerar código fonte"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Configuración dos literais enumerados"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Engadir a clase para a xerazón de código"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Configuración dos atributos da entidade"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Clases escollidas"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Configuración dos contidos"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Borrar a clase da xerazón de código"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Asociacións"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Clases disponíbeis"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Asociacións da clase"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Estado da xerazón de código fonte"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Operacións"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Prema no botón Xerazón para iniciar a xerazón de código"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibilidade"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Estado da xerazón"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Sinatura das o&peracións"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Mostrar os bloques acochados"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&quete"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">aquí vai o nome do componente</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributos"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Estereot&ipo"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Mostrar o tipo do bloque"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Sinatura dos atr&ibutos"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Cores"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Debuxar como un círculo"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Tipo de letra:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Estado inicial"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papel:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Estado final"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Escollido:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tipo do estado:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Bloque de obxecto UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nome do estado:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Bloque acochado:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Cor do widget"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"center\">Texto non editábel:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_clase"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Texto editábel:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nova clase"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Propiedades do diagrama"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributos da clase"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Ampliación:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operacións da clase"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Propiedades do parámetro"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Mostrar a &grella"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Dirección de paso"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Axus&tar á grella"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Axustar tamaño dos componentes"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" é un parámetro só de leitura, \"out\"é un parámetro só de escrita e "
-"\"inout\" é un parámetro para leitura e escrita."
+"Axusta o tamaño dos componentes para un múltiplo da luz da grella.\n"
+"Se \"Axustar á grella\" estivese activo os componentes ficarán sempre "
+"aliñados coa grella polos 4 lados."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Xerar"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Luz da grella: "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Finalizar"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Fontes xeradas"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Non xerado"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Ancho da liña: "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Aínda non xerado"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exportar todas as vistas"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "O cartafol %1 non existe. Desexa crialo agora?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Cartafol onde guardar os diagramas:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "O cartafol de saída non existe"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "O cartafol base onde se irán guardar as imaxes"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Criar un cartafol"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Tipo de &imaxe:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Non criar"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Usar carta&foles"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Non foi posíbel criar o cartafol.\n"
-"Comprobe que ten aceso de escrita ao cartafol que o contén ou escolla outro "
-"cartafol válido."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Erro ao criar o cartafol"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Por favor escolla un cartafol válido."
+"Cria no cartafol de destino a mesma estrutura en árbore usada\n"
+"no documento para guardar as vistas"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"O cartafol de saída xa existe, pero non é posíbel escribir nel.\n"
-"Por favor modifique os permisos ou escolla outro cartafol."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Erro ao escribir no cartafol de saída"
+"As vistas son guardadas en cartafoles no documento. A mesma estrutura en "
+"árbore usada no documento pode ser criada no cartafol base con esta opción.\n"
+"No cartafol base só se criarán os cartafoles criados polo usuario (a vista "
+"lóxica, vista de casos de uso e demais non serán criados)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 non parece ser un cartafol. Por favor escolla un cartafol válido."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Variabilidade do papel"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Escolla un cartafol válido"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Visibilidade do papel"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "O Ficheiro de destino xa existe"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportar"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"O ficheiro %1 xa existe en %2.\n"
-"\n"
-"Umbrello pode sobrescribir o ficheiro, xerar un nome\n"
-"semellante ou non xerar este ficheiro."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Aplicar para todos os ficheiros restantes"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "S&obrescribir"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Xerar un nome de ficheiro semellante"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Non xerar o ficheiro"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\" >Non hai nengunha opción disponíbel.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicidade"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Indique a multiplicidade:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nome da asociación"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Indique o nome da asociación:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nome do papel"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Indique o nome do papel:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Indique o nome da operación:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Insira o novo texto:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERRO"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Mudar o texto"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Aliñar á esquerda"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Aliñar á dereita"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagrama"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Aliñar ao cume"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Novo"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Aliñar ao fondo"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "M&ostrar"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Aliñar ao centro na vertical"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Ampliación:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Aliñar ao centro na horizontal"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Código fonte"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Aliñar distribuido na vertical"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Linguaxe activa"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Aliñar distribuido na horizontal"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Para aliñar, terá que escoller polo menos 2 obxectos, por exemplo clases ou "
-"actores. Non poderá aliñar asociacións."
+"<p>Benvido a Umbrello.</p>\n"
+"<p>Os diagramas UML permítenlle deseñar e documentar sóftware orientado a "
+"obxectos. <a href=\"help:/umbrello\">O Manual de Umbrello</a> é unha boa "
+"introdución ao uso de UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Esta palabra chave está reservada na linguaxe indicada no xerador de fontes."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Palabra chave reservada"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "A exportar a vista..."
+"<p>Benvido a Umbrello 1.5. As novidades desta versión son as clases de "
+"asociación, a xerazón de código en Ruby, a externalización de cartafoles, a "
+"capacidade de mudar interfaces para clases, entre outras.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Aconteceu un erro ao exportar a imaxe:\n"
+"<p>Os diagramas en páxinas e os cartafoles externalizados son mutuamente "
+"excluintes. Se necesita de cartafoles externos, desinale a opción &quot;Usar "
+"diagramas en páxinas&quot; na Configuración xeral.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"O ficheiro escollido %1 xa existe.\n"
-"Desexa sobrescribilo?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "O ficheiro xa existe"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "actor_novo"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "casoDeUso_novo"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "paquete_novo"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "componente_nova"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nó_novo"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "artefacto_novo"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "interface_nova"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "tipodedatos_novo"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "enumeración_nova"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "entidade_nova"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "cartafol_novo"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "obxecto_novo"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Vacío"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argumento mal formado"
+"<p>Non poderá mudar o tamaño da maioría dos itens dos diagramas; eles "
+"mudarán o seu tamaño para se axustar ao seu contido.\n"
+"Pode mudar o tamaño das caixas, notas e mensaxes dos diagramas de secuencia, "
+"abondando con premer e arrastrar o cadro vermello.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tipo de argumento descoñecido"
+#: 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 ""
+"<p>Se quixer engadir unha clase xa existente a un diagrama, abonda arrastrar "
+"o seu ícone desde a vista en árbore.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nome de método ilegal"
+#: 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 ""
+"<p>O axente de refactorizazón de Umbrello permítelle mover operacións entre "
+"unha clase e as súas clases derivadas ou de base.\n"
+"Prema co botón dereito nunha clase para abrir o axente de refactorización.</"
+"p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tipo de retorno descoñecido"
+#: 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 ""
+"<p>Os obxectos dos diagramas de secuencia poden ter unha opción de "
+"destrución e poden ser mostrados como actores. Faga duplo-click nun para\n"
+"mostrar o diálogo de propiedades.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Erro non especificado"
+#: 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 ""
+"<p>As mensaxes dos diagramas de secuencia poden actuar como construtores. "
+"Prema na caixa do obxecto (en vez da liña vertical) para convertelo nun "
+"construtor.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Engadir unha clase base"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Os diagramas de secuencia soportan mensaxes para si mesmos. Prema de novo "
+"na mesma liña vertical para criar unha mensaxe para si.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Engadir unha clase derivada"
+#: 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 ""
+"<p>Se ao cargar un ficheiro alleo, non fose mostrado nada na lista, probe a "
+"guardar o modelo con outro nome,\n"
+"pechalo e volver a cargar o ficheiro guardado. Normalmente  a lista será "
+"entón preenchida correctamente.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Engadir unha operación"
+#: 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 ""
+"<p>Cortar e apegar tamén exportarán a imaxe para o porta-retallos en PNG, a "
+"cal poderá ser pegada en KWord e noutras aplicacións.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Engadir un atributo"
+#: 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 ""
+"<p>As asociacións non teñen que formar liñas rectar, se preme dúas veces "
+"nunha, criará un punto móbil.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Engadir unha interface base"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Pode activar o guardado automático no diálogo de configuración de "
+"Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Engadir unha interface derivada"
+#: 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 ""
+"<p>Vota en falta algunha funcionalidade en Umbrello? Díganos cal é.\n"
+"Pode ou engadila á base de datos de erros mediante Comunicar un Erro no "
+"menú\n"
+"de Axuda ou mediante un correo para a lista de correo uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Clasificadores base"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Pode borrar todos os obxectos escollidos se preme en Supr ou Borrar.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Clasificadores derivados"
+#: 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 ""
+"<p>Se descobriu un erro en Umbrello, fáganolo saber.\n"
+"Pode comunicar os erros coa ferramenta de Comunicar un Erro no menú de Axuda."
+"</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Non é posíbel criar o cartafol: %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 ""
+"<p>Se preme na tecla Escape cambiará a ferramenta actual para a de "
+"selección.\n"
+"Coa tecla de borrar voltará para a ferramenta usada anteriormente.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Non é posíbel guardar un diagrama vacío"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Pode seleccionar todos os obxectos premendo Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Aconteceu un problema ao guardar o diagrama en %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 ""
+"<p>Pode criar e configurar unha nova clase usando o Asistente de novas "
+"clases no menú código.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "novo_estereotipo"
diff --git a/tde-i18n-hi/messages/tdesdk/umbrello.po b/tde-i18n-hi/messages/tdesdk/umbrello.po
index 254434ca6c8..48fe94f61b6 100644
--- a/tde-i18n-hi/messages/tdesdk/umbrello.po
+++ b/tde-i18n-hi/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\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-08-24 13:29+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -14,255 +14,202 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "अम्बरैलो यूएमएल मॉडलर लेखक गण"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "रविशंकर श्रीवास्तव"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "खोलने के लिए फ़ाइल"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "raviratlami@yahoo.com , http://www.geocities.com/raviratlami/"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "गतिविधि नाम भरें"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 पॉल हैंसगेन, (c) 2002-2003 अम्बरैलो यूएमएल मॉडलर लेखक गण"
+#: 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"
-msgstr "अम्बरैलो यूएमएल मॉडलर लेखक गण"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "छवि के रूप में निर्यात करें..."
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+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:42
+msgid "Align Top"
 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"
-msgstr "फ़ाइल सहेजने में त्रुटि आईः %1"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+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 "सहेजने में त्रुटि"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
+msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "वस्तु"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
+msgstr ""
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "सिंक्रोनस संदेश"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
+msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "एसिंक्रोनस संदेश"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
+msgstr ""
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "सम्बद्धता"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
 
-#: association.cpp:93 worktoolbar.cpp:249
+#: aligntoolbar.cpp:384
 #, fuzzy
-msgid "Containment"
-msgstr "रखी हुई वस्तुएँ"
-
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "एंकर"
+msgid "Information"
+msgstr "फार्मेट किया जा रहा है"
 
-#: worktoolbar.cpp:251
-msgid "Label"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
 msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "टिप्पणी"
-
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "बक्सा"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "सामान्यीकरण"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "कर्ता"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr "एग्रीगेशन"
 
 #: association.cpp:86 worktoolbar.cpp:255
 msgid "Dependency"
 msgstr "डिपेंडेंसी"
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
-msgstr "एग्रीगेशन"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "सम्बद्धता"
 
-#: worktoolbar.cpp:257
-#, fuzzy
-msgid "Relationship"
-msgstr "रीयलाइज़ेशन"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "स्वतः सम्बद्धता"
 
-#: worktoolbar.cpp:258
+#: association.cpp:89
 #, fuzzy
-msgid "Directional Association"
-msgstr "यूनिडायरेक्शनल सम्बद्धता"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "इम्प्लीमेंट्स (जनरलाइज़ेशन/रीयलाइज़ेशन)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "कम्पोज़िशन"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "वर्ग"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "आरंभिक अवस्था"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "अंत अवस्था"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "शाखा/मिलाएँ"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "तोड़ें/मिलाएँ"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "पैकेज"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "अवयव"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "नोड"
-
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "आर्टिफेक्ट"
-
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "इंटरफेस"
-
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "डाटाटाइप"
-
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "एन्यूम"
+msgid "Collaboration Message"
+msgstr "साझेदारी"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#: association.cpp:90
 #, fuzzy
-msgid "Entity"
-msgstr "अंतिम गतिविधि"
+msgid "Sequence Message"
+msgstr "आरेख अनुक्रम"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr ""
+#: association.cpp:91
+#, fuzzy
+msgid "Collaboration Self Message"
+msgstr "कोलाबरेशन आरेख"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: worktoolbar.cpp:277
+#: association.cpp:93 worktoolbar.cpp:249
 #, fuzzy
-msgid "Join"
-msgstr "तोड़ें/मिलाएँ"
+msgid "Containment"
+msgstr "रखी हुई वस्तुएँ"
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "तोड़ें/मिलाएँ"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "कम्पोज़िशन"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
+#: association.cpp:95
+msgid "Realization"
+msgstr "रीयलाइज़ेशन"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "यूनी सम्बद्धता"
+
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "एंकर"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "अवस्था परिवर्तन"
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "गतिविधि परिवर्तन"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "क्रियाएँ"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "अवस्था "
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "गुणनता"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "अंतिम गतिविधि"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "गुणनता भरें:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "आरंभिक गतिविधि"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "सम्बद्धता नाम"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "संदेश"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "सम्बद्धता नाम भरें:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr ""
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "भूमिका नाम"
 
-#: worktoolbar.cpp:302
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "भूमिका नाम भरें:"
+
+#: classifier.cpp:201
 #, fuzzy
-msgid "Select"
-msgstr "चयन"
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr "%1 में उस हस्ताक्षर के साथ एक संचालन पहले ही मौज़ूद है.\n"
+
+#: 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 "वह एक अवैध नाम है."
+
+#: 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 "अवैध नाम"
+
+#: 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 "वह नाम पहले ही उपयोग में है."
+
+#: 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 "नाम बेजोड़ नहीं है"
 
 #: 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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -274,18 +221,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"फ़ाइल %1 को लिखने के लिए खोल नहीं सका. कृपया सुनिश्चित हों कि फ़ोल्डर उपलब्ध है "
-"तथा आपके पास इस पर लिखने की अनुमतियाँ हैं."
+"फ़ाइल %1 को लिखने के लिए खोल नहीं सका. कृपया सुनिश्चित हों कि फ़ोल्डर उपलब्ध है तथा आपके "
+"पास इस पर लिखने की अनुमतियाँ हैं."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "फ़ाइल खोल नहीं सका"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"फ़ोल्डर बना नहीं सकता:\n"
+msgid "Cannot create the folder:\n"
+msgstr "फ़ोल्डर बना नहीं सकता:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -299,1290 +244,1543 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "फ़ोल्डर बना नहीं सकता"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "अवस्था नाम भरें"
+#: codegenerators/cppcodegenerationform.cpp:36
+#, fuzzy
+msgid "General Options"
+msgstr "सामान्य विन्यास"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "नई अवस्था का नाम भरें:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "पैकेज नेमस्पेस है"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "क्रिया भरें"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "आभासी डिस्ट्रक्टर्स"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "नई क्रिया का नाम भरें:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "खाली कंस्ट्रक्टर्स तैयार करें"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "नई क्रिया"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "एक्सेसर विधियाँ तैयार करें"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-#, fuzzy
-msgid "UML Model"
-msgstr "अम्बरैलो यूएमएल मॉडलर"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "संचालन इनलाइन हैं"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "लॉजिकल दृश्य"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "एक्सेसर्स इनलाइन हैं"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "केस दृश्य इस्तेमाल करें"
+#: codegenerators/cppcodegenerationform.cpp:57
+#, fuzzy
+msgid "Accessors are public"
+msgstr "एक्सेसर्स इनलाइन हैं"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "अवयव दृश्य"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "डिपोलायमेंट दृश्य"
+#: 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 "तैयार."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "डाटाटाइप्स"
-
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
-"मौज़ूदा फ़ाइल परिवर्धित किया गया है.\n"
-" क्या आप इसे सहेजना चाहते हैं?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
+#: codeimport/import_utils.cpp:183
+#, fuzzy
+msgid "Namespace"
+msgstr "नया_पैकेज"
 
-#: 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 "लोड त्रुटि"
+#: 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 "वर्ग"
 
-#: umldoc.cpp:380
+#: codeimport/kdevcppparser/errors.cpp:23
 #, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
+msgid "Internal Error"
+msgstr "चिपकाने में त्रुटि"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: umldoc.cpp:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "फ़ाइल लोड करने में समस्या आईः %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "फ़ाइल लोड करने में समस्या आईः %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "फ़ाइल अपलोड करने में त्रुटि आईः %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "केस आरेख इस्तेमाल करें"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "वर्ग आरेख"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+#, fuzzy
+msgid "} expected"
+msgstr "चुना गयाः"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "आरेख अनुक्रम"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "कोलाबरेशन आरेख"
+#: codeimport/kdevcppparser/parser.cpp:688
+#, fuzzy
+msgid "{ expected"
+msgstr "चुना गयाः"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "आरेख अवस्था"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "क्रिया आरेख"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "आरेख अवयव"
+#: codeimport/kdevcppparser/parser.cpp:938
+#, fuzzy
+msgid "expected a declaration"
+msgstr "संचालन चुनें"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "डिपोलायमेंट आरेख"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 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 "नाम"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "नाम भरें:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "आरेख के लिए यह एक अवैध नाम है."
+#: codeimport/kdevcppparser/parser.cpp:2235
+#, fuzzy
+msgid "Base class specifier expected"
+msgstr "बेस क्लॉसीफ़ायर्स"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "अवैध नाम"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "एक आरेख पहले ही उस नाम का उपयोग कर रहा है."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+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"
-msgstr "नाम बेजोड़ नहीं है"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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."
-msgstr "वह एक अवैध नाम है."
+#: codeimport/kdevcppparser/parser.cpp:2374
+#, fuzzy
+msgid "Class name expected"
+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."
-msgstr "वह नाम पहले ही उपयोग में है."
+#: 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:1067 umllistview.cpp:1916
-#, fuzzy
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
 msgstr ""
-"जो नाम आपने प्रविष्ट किया है बेजोड़ नहीं है!\n"
-"क्या यही आप चाहते हैं?"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "नाम बेजोड़ नहीं है"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Use Name"
-msgstr "केस इस्तेमाल करें"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: 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 "Enter New Name"
-msgstr "अवस्था नाम भरें"
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "क्या आप वाक़ई आरेख %1 को मिटाना चाहते हैं?"
+msgid "Properties"
+msgstr "गुण (&P)"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "आरेख मिटाएँ"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "आरंभिक गतिविधि"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "दस्तावेज़ विन्यासित किया जा रहा है..."
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "क्रियाएँ बन्द"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "शाखा/मिलाएँ"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "यूएमएल अवयव लोड किया जा रहा है..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "तोड़ें/मिलाएँ"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "आरेख लोड किया जा रहा है..."
+#: 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 "सामान्य"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-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 "सामान्य गुण"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/स्वचलित-सहेजें%1"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "गतिविधि क़िस्मः"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "गतिविधि नामः"
 
-#: umllistview.cpp:416
-#, fuzzy
-msgid "Enter Model Name"
-msgstr "अवस्था नाम भरें"
+#: 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 "दस्तावेजीकरण"
 
-#: umllistview.cpp:417
+#: 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 "Enter the new name of the model:"
-msgstr "गतिविधि का नया नाम भरें:"
+msgid "Font"
+msgstr "फ़ॉन्टःः"
 
-#: umllistview.cpp:1007
-msgid "Views"
-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 "फ़ॉन्ट विन्यास"
 
-#: umllistview.cpp:1906
-#, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"जो नाम आपने प्रविष्ट किया है अवैध है!\n"
-"तैयार करने की प्रक्रिया रद्द कर दी गई है."
+#: 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 "रंग"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "नाम वैध नहीं है"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "विजेट रंग"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"जो नाम आपने प्रविष्ट किया है बेजोड़ नहीं है!!\n"
-"बनाने की प्रक्रिया रद्द कर दी गई."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "क्रियाएँ"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "नई क्रिया..."
 
-#: umllistview.cpp:2338
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid "Loading listview..."
-msgstr "आरेख लोड किया जा रहा है..."
+msgid "Delete"
+msgstr "एंकर मिटाएँ"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "फ़ोल्डर को मिटा सकें इस के लिए पहले इसे खाली करना होगा."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "नाम बदलें "
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "फ़ोल्डर खाली नहीं है"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "नई क्रिया"
 
-#: classifier.cpp:201
-#, fuzzy
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"%1 में उस हस्ताक्षर के साथ एक संचालन पहले ही मौज़ूद है.\n"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "नई क्रिया"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "गतिविधि नाम भरें"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "क्रिया नाम बदलें "
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "नई अवस्था"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "गतिविधि का नया नाम भरें:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "सामान्यीकरण"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "नाम:"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "स्वतः सम्बद्धता"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "क़िस्मः"
 
-#: association.cpp:89
-#, fuzzy
-msgid "Collaboration Message"
-msgstr "साझेदारी"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "सम्बद्धता"
 
-#: association.cpp:90
-#, fuzzy
-msgid "Sequence Message"
-msgstr "आरेख अनुक्रम"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "सम्बद्धता गुण"
 
-#: association.cpp:91
-#, fuzzy
-msgid "Collaboration Self Message"
-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 "सामान्य विन्यास"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "भूमिकाएँ"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "रीयलाइज़ेशन"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "भूमिका विन्यास "
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "यूनी सम्बद्धता"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "सम्बद्धता फ़ॉन्ट"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "भूमिका ए गुण"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "आरेख (&D)"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "भूमिका बी गुण"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "नया (&N)"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "भूमिका ए दृश्यता"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "दिखाएँ (&o)"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "भूमिका बी दृश्यता"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
-msgstr "कोड (&C)"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "भूमिका ए परिवर्तनीयता"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
-msgstr "सक्रिय भाषा (&L)"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+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
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "Documentation"
-msgstr "दस्तावेजीकरण"
+msgid "Rolename:"
+msgstr "भूमिका-नामः"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "स्लैश-स्लैश (//)"
+msgid "Multiplicity:"
+msgstr "गुणनताः"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "स्लैश-तारा (/**  */)"
+msgid "Public"
+msgstr "सार्वजनिक"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: 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 "Style:"
-msgstr "शैली:"
+msgid "Private"
+msgstr "निजी "
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: 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 "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">सी++ कोड तैयार करना</p>"
+msgid "Protected"
+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
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "General"
-msgstr "सामान्य"
+msgid "Implementation"
+msgstr "क्रियान्वयन"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "विधि मुख्य भाग तैयार करना"
+msgid "Changeable"
+msgstr "परिवर्तनीय"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr ""
+msgid "Frozen"
+msgstr "फ्रोजन"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+msgid "Add only"
+msgstr "सिर्फ जोड़ें"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "सदिश"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "वर्ग नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>चर</b>"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "अभिनेता नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "पैकेज नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "क्यू-स्ट्रिंग"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "केस नाम इस्तेमाल करें: (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "स्ट्रिंग"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "इंटरफेस नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">स्ट्रिंग</p>"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "अवयव नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">सूची</p>"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "शिल्पतथ्य नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "ईन्यूम नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>वैश्विक?</i>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "डाटाटाइप नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:68
+#, fuzzy
+msgid "Entity &name:"
+msgstr "ईन्यूम नामः (&n)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "वर्ग नाम"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "स्टीरियोटाइप नामः (&S)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">फ़ाइल सम्मिलित</p></i>"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "पैकेज नामः (&P)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "परियोजना तैयार करना"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "गुणधर्म वर्ग (&b)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "एएनटी बिल्ड दस्तावेज़ तैयार करें"
+#: dialogs/classgenpage.cpp:123
+#, fuzzy
+msgid "A&bstract use case"
+msgstr "गुणधर्म वर्ग (&b)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "विधियाँ स्वचलित तैयार करें"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "चलाने-योग्यः (&E)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "कंस्ट्रक्टर विधियाँ खाली करें"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "ऐसे आरेखित करें"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, fuzzy, no-c-format
-msgid "Association accessor methods"
-msgstr "एक्सेसर विधियाँ"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "डिफ़ॉल्ट (&D)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
 #, fuzzy, no-c-format
-msgid "Attribute accessor methods"
-msgstr "एक्सेसर विधियाँ तैयार करें"
+msgid "&File"
+msgstr "भरें: (&F)"
 
-#. 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 "सार्वजनिक"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "लाइब्रेरी (&L)"
 
-#. 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 "निजी "
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "टेबल (&T)"
 
-#. 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 "सुरक्षित"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "दृश्यता"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "पैरेन्ट ऑब्जेक्ट से"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "सार्वजनिक (&u)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "डिफ़ॉल्ट गुणधर्म स्कोपः"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "निजी (&r)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "डिफ़ॉल्ट संचालन स्कोपः"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "सुरक्षित (&t)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, fuzzy, no-c-format
-msgid "From Parent Role"
-msgstr "पैरेन्ट ऑब्जेक्ट से"
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "क्रियान्वयन"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">जावा कोड तैयार करना</p>"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "वर्ग नामः"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr ""
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "इंटरफेस नामः"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "अभिनेता की तरह आरेखित करें"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "बहु इंस्टेंस"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "डिस्ट्रक्शन्स दिखाएँ"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "अवयव नामः"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "नोड नामः"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">सी++ कोड तैयार करना</p>"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "नाम बेजोड़ नहीं है"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "गुणधर्म"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "नया गुणधर्म... (&e)"
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "संचालन"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "नया संचालन... (&e)"
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "प्रारूप"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "नया टैम्प्लेट... (&e)"
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "ईन्यूम लिटरल्स"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "नया ईन्यूम लिटरल्स... (&e)"
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "गुणधर्म"
+
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "नया गुणधर्म... (&e)"
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "एंकर मिटाएँ"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "गुण (&P)"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "दिखाएँ"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "संचालन (&n)"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "दृश्यता (&V)"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "संचालन हस्ताक्षर (&p)"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "पैकेज (&k)"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "एट्रिब्यूट्स (&r)"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "स्टीरियोटाइप (&y)"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "एट्रिब्यूट हस्ताक्षर (&i)"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "वृत्त की तरह आरेखित करें"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "प्रकटन"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "प्रदर्शक विकल्प"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "गुणधर्म विन्यास "
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "संचालन विन्यास"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "टेम्प्लेट्स विन्यास"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "ईन्यूम लिटरल्स विन्यास"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "गुणधर्म विन्यास "
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "रखी हुई वस्तुएँ"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "विषय-वस्तु विन्यास"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "वर्ग सम्बद्धता"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "नया_वर्ग"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "नया वर्ग"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "वर्ग गुणधर्म"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "क्लास संचालन"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "कोड बनाने का विकल्प"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "भाषा"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "बनाएँ (&G)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "फ़ोल्डर"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "समाप्त"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "सभी तैयार फ़ाइलों को फ़ोल्डर में लिखें:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "कोड बन गया"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "ब्राउज़ करें... (&w)"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "नहीं बना"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "ब्राउज... (&r)"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "अभी नहीं बना"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "फ़ोल्डर से हेडिंग फ़ाइल शामिल करें... (&I)"
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "खोज डिरेक्ट्री %1 अभी तक उपलब्ध नहीं है. क्या आप निर्देशिका अभी तैयार करना चाहेंगे?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "कोड ज़ेनरेटर द्वारा तैयार की गई फ़ाइलें इस फ़ोल्डर में लिखी जाएंगी"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "आउटपुट डिरेक्ट्री अस्तित्व में नहीं है."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "फ़ोल्डर बना नहीं सकता"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "फ़ाइल तैयार नहीं करें (&D)"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"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 dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "मिटाकर लिखने की नीति"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "डायरेक्टरी तैयार करने में त्रुटि"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "कृपया वैध डिरेक्ट्री चुनें."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "मिटाकर लिखें (&v)"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+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/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "पूछें (&k)"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "कृपया वैध डिरेक्ट्री चुनें"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
+msgid "Code Viewer"
+msgstr "कोड प्रदर्शक"
+
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "भिन्न नाम इस्तेमाल करें (&U)"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "आरेख (&D)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "फ़िल्टर"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "फार्मेट किया जा रहा है"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "मौज़ूदा आरेख (&C)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "लकीरें"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "सभी आरेख (&A)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "पंक्ति ख़त्म होने की शैलीः"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "आरेख चुनें (&S)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "हाशिया क़िस्मः"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "आरेख क़िस्म (&T)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "हाशिए की मात्राः"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "चयन"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "केस इस्तेमाल करें"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "साझेदारी"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "अनुक्रम"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "अवस्था "
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "अवयव"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "डिपोलायमेंट दृश्य"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "केडीई-यूएमएल-डायग्राम"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "कोई आरेख चुना नहीं गया."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
-"*निक्स (\"\n"
-"\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "टीप दस्तावेज़ीकरण"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "गंतव्य फ़ाइल पहले से मौज़ूद है"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"विंडोज़ (\"\\r\n"
-"\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "मैक (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "सभी बची फ़ाइलों में लागू करें (&A)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "हाशिया नहीं"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "मिटाकर लिखें (&O)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "टैब"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "एक जैसे फ़ाइल नाम तैयार करें (&G)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "स्पेस"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "फ़ाइल तैयार नहीं करें (&D)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "टिप्पणी वाचालता"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+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/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "क़िस्मः (&T)"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "नाम: (&N)"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "आरंभिक मानः (&I)"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"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 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "रखी हुई वस्तुएँ"
+
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "संचालन चुनें"
+
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "अनुक्रम क्रमांक:"
+
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "क्लास संचालन:"
+
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "मनपसंद संचालन:"
+
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "अम्बेरेलो सेटअप"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "उपयोक्ता इंटरफेस"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "उपयोक्ता इंटरफेस विन्यास"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "रेखा का रंगः"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "डिफ़ॉल्ट रंग (&e)"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "भराव रंगः"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "डिफ़ॉल्ट रंग (&f)"
+
+#: dialogs/settingsdlg.cpp:73
+#, fuzzy
+msgid "Line width:"
+msgstr "पंक्तिः"
+
+#: dialogs/settingsdlg.cpp:81
+#, fuzzy
+msgid "D&efault Width"
+msgstr "डिफ़ॉल्ट (&e)"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "भराव रंग इस्तेमाल करें... (&U)"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 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:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "स्वचलित सहेजना सक्षम करें (&n)"
+
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "आरेख अवस्था"
+
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "भाषा विकल्प"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "डिफ़ॉल्ट संचालन स्कोपः"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "कोड बनाने का विज़ार्ड..."
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "स्वतः सहेजें"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "वर्ग चुनें"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "स्वचलित सहेजना सक्षम करें (&n)"
 
-#. 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:136
+msgid "Select auto-save time interval (mins):"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "कोड बनाने के लिए वर्ग जोड़ें"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "वर्ग चयनित"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "कोड बनाने में से वर्ग मिटाएँ"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "प्रारंभ में"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "वर्ग उपलब्ध"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "प्रारंभिक लोगो (&r)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "कोड बनाने की स्थिति"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "आज का नुस्ख़ा (&T)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr ""
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "पिछली परियोजना लोड करें (&L)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "बनाने की स्थिति"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "के साथ नई परियोजना प्रारंभ करें:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "कोड प्रदर्शक"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "कोई आरेख नहीं"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "छुपे ब्लॉक्स दिखाएँ"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "वर्ग आरेख"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">अवयव नाम यहाँ</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "केस आरेख इस्तेमाल करें"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "ब्लॉक क़िस्म दिखाएँ"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "आरेख अनुक्रम"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "रंग"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "कोलाबरेशन आरेख"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "फ़ॉन्टःः"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "आरेख अवस्था"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "कागजः"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "क्रिया आरेख"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "चुना गयाः"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "आरेख अवयव"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">यूएमएल ऑब्जेक्ट ब्लॉक:</p>"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "डिपोलायमेंट आरेख"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">छुपे ब्लॉक:</p>"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "क्लास विन्यास"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">असंपादन योग्य पाठ:</p>"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "दृश्यता दिखाएँ (&v)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">संपादन योग्य पाठ:</p>"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "गुणधर्म दिखाएँ"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "आरेख गुण"
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "संचालन दिखाएँ"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "नाम:"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "स्टीरियोटाइप दिखाएँ (&y)"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "ज़ूमः"
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "गुणधर्म हस्ताक्षर दिखाएँ"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "पैकेज दिखाएँ"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "संचालन हस्ताक्षर दिखाएँ"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "ग्रिड दिखाएँ (&g)"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "स्कोप प्रारंभ किया जा रहा है"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "ग्रिड में स्नेप करें (&t)"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "डिफ़ॉल्ट गुणधर्म स्कोपः"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "अवयव आकार स्नैप करें"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "डिफ़ॉल्ट संचालन स्कोपः"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "कोड तैयार करना"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "कोड बनाने के लिए विन्यास"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "कोड प्रदर्शक विन्यास"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "आरंभिक अवस्था"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "अंत अवस्था"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "अवस्था क़िस्मः"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "अवस्था नामः"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "विजेट रंग"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "एट्रीब्यूट गुण"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "क्लासीफॉयर स्कोप (\"स्थिर\") (&s)"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "सार्वजनिक (&P)"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "सुरक्षित (&e)"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "क्रियान्वयन"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "आपने एक अवैध गुणधर्म नाम भरा है."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "अवैध गुणधर्म नाम"
+
+#: dialogs/umlattributedialog.cpp:163
 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."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "गुणधर्म नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
+
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "गुणधर्म नाम बेजोड़ नहीं है"
+
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
+msgstr "एट्रीब्यूट गुण"
+
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "डिफ़ॉल्ट (&D)"
+
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, fuzzy, no-c-format
-msgid "Grid spacing:  "
-msgstr "ग्रिड स्पेसिंगः X"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "गुणधर्म"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "छवि के रूप में निर्यात करें..."
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "नया (&N)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlentityattributedialog.cpp:115
+#, fuzzy
+msgid "&Primary"
+msgstr "लाइब्रेरी (&L)"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 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:121
+msgid "&Unique"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "अवस्था क़िस्मः"
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+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:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "अवैध गुणधर्म नाम"
+
+#: dialogs/umlentityattributedialog.cpp:192
+#, fuzzy
+msgid ""
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "गुणधर्म नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
+
+#: dialogs/umlentityattributedialog.cpp:193
+#, fuzzy
+msgid "Entity Attribute Name Not Unique"
+msgstr "गुणधर्म नाम बेजोड़ नहीं है"
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "संचालन गुण"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "एब्सट्रैक्ट संचालन (&A)"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "फ़ोल्डर"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "पैरामीटर्स"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "नया पैरामीटर... (&w)"
+
+#: 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 ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
+"पैरामीटर नाम जो आपने चुना है\n"
+"इस संचालन में पहले से ही उपयोग में है."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "पैरामीटर नाम बेजोड़ नहीं है"
+
+#: dialogs/umloperationdialog.cpp:406
 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)."
-msgstr ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "पैरामीटर नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "आपने एक अवैध संचालन नाम भरा है."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "अवैध संचालन नाम"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "%1 में उस हस्ताक्षर के साथ एक संचालन पहले ही मौज़ूद है.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "एक भिन्न नाम या पैरामीटर सूची चुनें."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "भूमिका गुण"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "भूमिका-नामः"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "टेम्प्लेट गुण"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "गुणनताः"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "आपने एक अवैध टेम्प्लेट नाम भरा है."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "भूमिका परिवर्तनशीलता"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template 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"
-msgstr "सिर्फ जोड़ें"
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "पैरामीटर नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "फ्रोजन"
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "पैरामीटर नाम बेजोड़ नहीं है"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "परिवर्तनीय"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "क्लासेज़ प्रदर्शक विकल्प"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "भूमिका दृश्यता"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "आरेख रंग"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "क्रियान्वयन"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+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"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "जो नाम आपने भरा है वह बेजोड़ नहीं है."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "नाम बेजोड़ नहीं है"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "पंक्तिः (&L)"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "भरें: (&F)"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "डिफ़ॉल्ट (&e)"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "भराव इस्तेमाल करें (&U)"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+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"
+#: 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:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-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"
+msgstr "फ़ाइल सहेजने में त्रुटि आईः %1"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: 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 "सहेजने में त्रुटि"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "अम्बरैलो यूएमएल मॉडलर लेखक गण"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "खोलने के लिए फ़ाइल"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:76
+#: docgenerators/main.cpp:64
+#, fuzzy
 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 ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 पॉल हैंसगेन, (c) 2002-2003 अम्बरैलो यूएमएल मॉडलर लेखक गण"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
+#: 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"
-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 "नाम"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
+#: 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 "नाम भरें:"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>कंट्रोल-A दबा कर आप सभी ऑब्जैक्ट्स का चयन कर सकते हैं.</p>\n"
+#: floatingtextwidget.cpp:112
+#, fuzzy
+msgid "Enter operation name:"
+msgstr "सम्बद्धता नाम भरें:"
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "नया पाठ भरें:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "त्रुटि"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "पाठ बदलें"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
+
+#: 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 "लोड त्रुटि"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1639,6 +1837,10 @@ msgstr "नया संचालन..."
 msgid "Select Operation..."
 msgstr "संचालन चुनें..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "पाठ बदलें..."
@@ -1688,6 +1890,19 @@ msgstr "नया"
 msgid "Rename..."
 msgstr "नाम बदलें..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "चिपकाने में त्रुटि"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "रेखा का रंग..."
@@ -1718,14 +1933,26 @@ msgstr "चिपकाने में त्रुटि"
 msgid "Import Classes..."
 msgstr "वर्गों को आयात करें.."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "पैकेज"
+
 #: 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 "नोड"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "डिपोलायमेंट आरेख..."
@@ -1734,11 +1961,20 @@ msgstr "डिपोलायमेंट आरेख..."
 msgid "Folder"
 msgstr "फ़ोल्डर"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "अंतिम गतिविधि"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 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 "केस आरेख इस्तेमाल करें..."
@@ -1776,6 +2012,18 @@ msgstr "नया गुणधर्म..."
 msgid "Export as Picture..."
 msgstr "छवि के रूप में निर्यात करें..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "इंटरफेस"
+
+#: 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 "वर्ग आरेख..."
@@ -1796,27 +2044,11 @@ msgstr "आरेख अनुक्रम..."
 msgid "Collaboration Diagram..."
 msgstr "कोलाबरेशन आरेख..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "गुणधर्म"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "संचालन"
-
 #: listpopupmenu.cpp:676
 #, fuzzy
 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 "संचालन हस्ताक्षर"
@@ -1829,11 +2061,6 @@ msgstr "गुणधर्म हस्ताक्षर"
 msgid "Stereotype"
 msgstr "स्टीरियो-टाइप"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "दिखाएँ"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "विशेषता"
@@ -1858,14 +2085,6 @@ msgstr "भराव रंग..."
 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 "रंग"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "कर्ता..."
@@ -1894,10 +2113,26 @@ msgstr "ईन्यूम"
 msgid "Package..."
 msgstr "पैकेज..."
 
+#: 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 "अवस्था..."
 
+#: 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..."
@@ -1945,6 +2180,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 "आरेख साफ करें"
@@ -1980,8 +2223,8 @@ 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
@@ -1989,193 +2232,95 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(c) 2001 पॉल हैंसगेन, (c) 2002-2003 अम्बरैलो यूएमएल मॉडलर लेखक गण"
 
-#: 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
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
-
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "रविशंकर श्रीवास्तव"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "raviratlami@yahoo.com , http://www.geocities.com/raviratlami/"
-
-#: 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 "तैयार."
-
-#: 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 ""
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "नया_अभिनेता"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "नया_यूज़केस"
 
-#: codeimport/import_utils.cpp:183
-#, fuzzy
-msgid "Namespace"
+#: model_utils.cpp:248
+msgid "new_package"
 msgstr "नया_पैकेज"
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-#, fuzzy
-msgid "Internal Error"
-msgstr "चिपकाने में त्रुटि"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "नया_अवयव"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "नया_नोड"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr ""
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "नया_शिल्पतथ्य"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "नया_इंटरफेस"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-#, fuzzy
-msgid "} expected"
-msgstr "चुना गयाः"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "नया_डाटाटाइप"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "नया_ईन्यूम"
 
-#: codeimport/kdevcppparser/parser.cpp:688
+#: model_utils.cpp:262
 #, fuzzy
-msgid "{ expected"
-msgstr "चुना गयाः"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+msgid "new_entity"
+msgstr "नया_ईन्यूम"
 
-#: codeimport/kdevcppparser/parser.cpp:938
+#: model_utils.cpp:264
 #, fuzzy
-msgid "expected a declaration"
-msgstr "संचालन चुनें"
+msgid "new_folder"
+msgstr "नया_नोड"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "नया_सम्बद्धता"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "नया_ऑब्जैक्ट"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-#, fuzzy
-msgid "Base class specifier expected"
-msgstr "बेस क्लॉसीफ़ायर्स"
-
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: model_utils.cpp:560
+msgid "Illegal method name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-#, fuzzy
-msgid "Class name expected"
-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
@@ -2190,111 +2335,66 @@ msgstr "ऑब्जेक्ट नाम भरें:"
 msgid "new_parameter"
 msgstr "नया-पैरामीटर"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-#, fuzzy
-msgid "General Options"
-msgstr "सामान्य विन्यास"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "पैकेज नेमस्पेस है"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "बेस वर्ग जोड़ें"
 
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "आभासी डिस्ट्रक्टर्स"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "डिराइव्ड वर्ग जोड़ें"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "खाली कंस्ट्रक्टर्स तैयार करें"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "संचालन जोड़ें"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "एक्सेसर विधियाँ तैयार करें"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "एट्रिब्यूट जोड़ें"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "संचालन इनलाइन हैं"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "बेस इंटरफेस जोड़ें"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "एक्सेसर्स इनलाइन हैं"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "डिराइव्ड इंटरफेस जोड़ें"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-#, fuzzy
-msgid "Accessors are public"
-msgstr "एक्सेसर्स इनलाइन हैं"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "बेस क्लॉसीफ़ायर्स"
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "आरेखः %2 पृष्ठ %1"
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "डिराइव्ड क्लासीफ़ायर्स"
 
-#: umlview.cpp:2578
-#, fuzzy
-msgid "Enter Diagram Name"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
 msgstr "अवस्था नाम भरें"
 
-#: umlview.cpp:2579
-#, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "गतिविधि का नया नाम भरें:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"आप सम्पूर्ण आरेख को मिटाने वाले हैं.\n"
-"क्या आप सुनिश्चित हैं?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "आरेख मिटाएँ?"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr ""
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr ""
-
-#: umllistviewitem.cpp:478
-#, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"जो नाम आपने प्रविष्ट किया है अवैध है!\n"
-"नया नाम देने की प्रक्रिया रद्द कर दी गई है."
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "नया_सम्बद्धता"
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "नया_गुणधर्म"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "नई अवस्था का नाम भरें:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "नया-टैम्प्लेट"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "क्रिया भरें"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "नया_संचालन"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "सम्बद्धता का गलत उपयोग."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "नया_लिटरल"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "सम्बद्धता त्रुटि"
 
-#: umlcanvasobject.cpp:162
-#, fuzzy
-msgid "new_field"
-msgstr "नया_लिटरल"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "नई अवस्था"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2457,11 +2557,6 @@ msgstr "छवि के रूप में निर्यात करें.
 msgid "Export &All Diagrams as Pictures..."
 msgstr "छवि के रूप में निर्यात करें..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "गुण (&P)"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "ज़ूम स्लाइडर (&Z)"
@@ -2549,14 +2644,21 @@ msgstr "दस्तावेजीकरण (&D)"
 msgid "Opening file..."
 msgstr "फ़ाइल खोला जा रहा है..."
 
+#: 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 "नया दस्तावेज़ बनाया जा रहा है..."
 
 #: 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"
@@ -2583,6 +2685,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2591,6 +2697,10 @@ msgstr ""
 "फ़ाइल  %1 पहले से ही मौजूद है. \n"
 "क्या आप इसके ऊपर लिखना चाहते हैं?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2627,8 +2737,8 @@ msgstr "क्लिपबोर्ड की वस्तुओं को प�
 
 #: 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
@@ -2689,1268 +2799,1255 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr "आयात के लिए क्लासेज़ चुनें"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "वर्ग नामः (&n)"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "अभिनेता नामः (&n)"
-
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "पैकेज नामः (&n)"
-
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "केस नाम इस्तेमाल करें: (&n)"
-
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "इंटरफेस नामः (&n)"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "अवयव नामः (&n)"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "नया_गुणधर्म"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "शिल्पतथ्य नामः (&n)"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "नया-टैम्प्लेट"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "ईन्यूम नामः (&n)"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "नया_संचालन"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "डाटाटाइप नामः (&n)"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "नया_लिटरल"
 
-#: dialogs/classgenpage.cpp:68
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Entity &name:"
-msgstr "ईन्यूम नामः (&n)"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "स्टीरियोटाइप नामः (&S)"
-
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "पैकेज नामः (&P)"
-
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "गुणधर्म वर्ग (&b)"
+msgid "new_field"
+msgstr "नया_लिटरल"
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "गुणधर्म वर्ग (&b)"
+msgid "UML Model"
+msgstr "अम्बरैलो यूएमएल मॉडलर"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "चलाने-योग्यः (&E)"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "लॉजिकल दृश्य"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "ऐसे आरेखित करें"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "केस दृश्य इस्तेमाल करें"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "डिफ़ॉल्ट (&D)"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "अवयव दृश्य"
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "लाइब्रेरी (&L)"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "डिपोलायमेंट दृश्य"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "टेबल (&T)"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "सार्वजनिक (&u)"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "डाटाटाइप्स"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "निजी (&r)"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"मौज़ूदा फ़ाइल परिवर्धित किया गया है.\n"
+" क्या आप इसे सहेजना चाहते हैं?"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "सुरक्षित (&t)"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
 
-#: dialogs/classgenpage.cpp:186
+#: umldoc.cpp:380
 #, fuzzy
-msgid "Imple&mentation"
-msgstr "क्रियान्वयन"
-
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "वर्ग नामः"
+msgid "The file %1 seems to be corrupted."
+msgstr "फ़ाइल %1 अस्तित्व में नहीं है."
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "इंटरफेस नामः"
+#: 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:272
-msgid "Draw as actor"
-msgstr "अभिनेता की तरह आरेखित करें"
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "फ़ाइल लोड करने में समस्या आईः %1"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "बहु इंस्टेंस"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "फ़ाइल लोड करने में समस्या आईः %1"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "डिस्ट्रक्शन्स दिखाएँ"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "फ़ाइल अपलोड करने में त्रुटि आईः %1"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "अवयव नामः"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "केस आरेख इस्तेमाल करें"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "नोड नामः"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "वर्ग आरेख"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "स्टीरियोटाइप नामः"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+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."
-msgstr ""
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "कोलाबरेशन आरेख"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "नाम बेजोड़ नहीं है"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "आरेख अवस्था"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "पंक्तिः (&L)"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "क्रिया आरेख"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "भरें: (&F)"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "आरेख अवयव"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "डिफ़ॉल्ट (&e)"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "डिपोलायमेंट आरेख"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "भराव इस्तेमाल करें (&U)"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "क्रियाएँ"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "आरेख के लिए यह एक अवैध नाम है."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "नई क्रिया..."
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "एक आरेख पहले ही उस नाम का उपयोग कर रहा है."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "नाम बदलें "
+#: umldoc.cpp:1067 umllistview.cpp:1916
+#, fuzzy
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"जो नाम आपने प्रविष्ट किया है बेजोड़ नहीं है!\n"
+"क्या यही आप चाहते हैं?"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "नई क्रिया"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "केस इस्तेमाल करें"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "क्रिया नाम बदलें "
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "अवस्था नाम भरें"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "गतिविधि का नया नाम भरें:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "क्या आप वाक़ई आरेख %1 को मिटाना चाहते हैं?"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "सम्बद्धता गुण"
+#: umldoc.cpp:1099
+msgid "Delete 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 "सामान्य विन्यास"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "दस्तावेज़ विन्यासित किया जा रहा है..."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "भूमिकाएँ"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "भूमिका विन्यास "
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+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 "फ़ॉन्ट विन्यास"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "आरेख लोड किया जा रहा है..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "सम्बद्धता फ़ॉन्ट"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/स्वचलित-सहेजें%1"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "टेम्प्लेट गुण"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+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 "सामान्य गुण"
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "अवस्था नाम भरें"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "क़िस्मः (&T)"
+#: umllistview.cpp:417
+#, fuzzy
+msgid "Enter the new name of the model:"
+msgstr "गतिविधि का नया नाम भरें:"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "नाम: (&N)"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "दर्शन"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "आपने एक अवैध टेम्प्लेट नाम भरा है."
+#: umllistview.cpp:1906
+#, fuzzy
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"जो नाम आपने प्रविष्ट किया है अवैध है!\n"
+"तैयार करने की प्रक्रिया रद्द कर दी गई है."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "अवैध टेम्प्लेट नाम"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "नाम वैध नहीं है"
 
-#: dialogs/umltemplatedialog.cpp:138
-#, fuzzy
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "पैरामीटर नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"जो नाम आपने प्रविष्ट किया है बेजोड़ नहीं है!!\n"
+"बनाने की प्रक्रिया रद्द कर दी गई."
 
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "पैरामीटर नाम बेजोड़ नहीं है"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "एट्रीब्यूट गुण"
+msgid "Loading listview..."
+msgstr "आरेख लोड किया जा रहा है..."
 
-#: dialogs/umlentityattributedialog.cpp:73
-#, fuzzy
-msgid "&Default value:"
-msgstr "डिफ़ॉल्ट (&D)"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "फ़ोल्डर को मिटा सकें इस के लिए पहले इसे खाली करना होगा."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "फ़ोल्डर खाली नहीं है"
+
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
+#: umllistviewitem.cpp:478
 #, fuzzy
-msgid "Attributes:"
-msgstr "गुणधर्म"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
+"जो नाम आपने प्रविष्ट किया है अवैध है!\n"
+"नया नाम देने की प्रक्रिया रद्द कर दी गई है."
 
-#: dialogs/umlentityattributedialog.cpp:112
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "आरेखः %2 पृष्ठ %1"
+
+#: umlview.cpp:2578
 #, fuzzy
-msgid "&None"
-msgstr "नया (&N)"
+msgid "Enter Diagram Name"
+msgstr "अवस्था नाम भरें"
 
-#: dialogs/umlentityattributedialog.cpp:115
+#: umlview.cpp:2579
 #, fuzzy
-msgid "&Primary"
-msgstr "लाइब्रेरी (&L)"
+msgid "Enter the new name of the diagram:"
+msgstr "गतिविधि का नया नाम भरें:"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
+"आप सम्पूर्ण आरेख को मिटाने वाले हैं.\n"
+"क्या आप सुनिश्चित हैं?"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr ""
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "आरेख मिटाएँ?"
 
-#: dialogs/umlentityattributedialog.cpp:184
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "आपने एक अवैध गुणधर्म नाम भरा है."
+msgid "Exporting view..."
+msgstr "बाहर हो रहे..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-#, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "अवैध गुणधर्म नाम"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
-#, fuzzy
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "गुणधर्म नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
-
-#: dialogs/umlentityattributedialog.cpp:193
-#, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "गुणधर्म नाम बेजोड़ नहीं है"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "प्रकटन"
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"फ़ाइल %1 पहले से ही मौजूद है. \n"
+"क्या आप इसके ऊपर लिखना चाहते हैं?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "क्लासेज़ प्रदर्शक विकल्प"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "फ़ाइल पहले से ही अस्तित्व में है"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "आरेख रंग"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "फ़ोल्डर बना नहीं सकता"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "जो नाम आपने भरा है वह अवैध है."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "एक खाली आरेख सहेज नहीं सकता"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "जो नाम आपने भरा है वह बेजोड़ नहीं है."
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "क़िस्मः"
+#: 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:30
-msgid "Umbrello Setup"
-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 ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "उपयोक्ता इंटरफेस"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "वस्तु"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "उपयोक्ता इंटरफेस विन्यास"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "सिंक्रोनस संदेश"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "रेखा का रंगः"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "एसिंक्रोनस संदेश"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "डिफ़ॉल्ट रंग (&e)"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "भराव रंगः"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "टिप्पणी"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "डिफ़ॉल्ट रंग (&f)"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "बक्सा"
 
-#: dialogs/settingsdlg.cpp:73
+#: worktoolbar.cpp:257
 #, fuzzy
-msgid "Line width:"
-msgstr "पंक्तिः"
+msgid "Relationship"
+msgstr "रीयलाइज़ेशन"
 
-#: dialogs/settingsdlg.cpp:81
+#: worktoolbar.cpp:258
 #, fuzzy
-msgid "D&efault Width"
-msgstr "डिफ़ॉल्ट (&e)"
-
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "भराव रंग इस्तेमाल करें... (&U)"
+msgid "Directional Association"
+msgstr "यूनिडायरेक्शनल सम्बद्धता"
 
-#: dialogs/settingsdlg.cpp:108
-#, fuzzy
-msgid "Enable undo"
-msgstr "स्वचलित सहेजना सक्षम करें (&n)"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "इम्प्लीमेंट्स (जनरलाइज़ेशन/रीयलाइज़ेशन)"
 
-#: dialogs/settingsdlg.cpp:112
-#, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "आरेख अवस्था"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "डिफ़ॉल्ट संचालन स्कोपः"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "स्वतः सहेजें"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "स्वचलित सहेजना सक्षम करें (&n)"
+msgid "Join"
+msgstr "तोड़ें/मिलाएँ"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr ""
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "तोड़ें/मिलाएँ"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "प्रारंभ में"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "प्रारंभिक लोगो (&r)"
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "गतिविधि परिवर्तन"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "आज का नुस्ख़ा (&T)"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "संदेश"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "पिछली परियोजना लोड करें (&L)"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "के साथ नई परियोजना प्रारंभ करें:"
+#: worktoolbar.cpp:302
+#, fuzzy
+msgid "Select"
+msgstr "चयन"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "कोई आरेख नहीं"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "वर्ग आरेख"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "केस आरेख इस्तेमाल करें"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "आरेख अनुक्रम"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "कोलाबरेशन आरेख"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "संचालन दिखाएँ"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "आरेख अवस्था"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "क्रिया आरेख"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "आरेख साफ करें"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "आरेख अवयव"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "डिपोलायमेंट आरेख"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "सामान्यीकरण"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "क्लास विन्यास"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "दृश्यता दिखाएँ (&v)"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "गुणधर्म दिखाएँ"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "सम्बद्धता नाम"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "संचालन दिखाएँ"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "स्टीरियोटाइप दिखाएँ (&y)"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "गुणधर्म हस्ताक्षर दिखाएँ"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "पैकेज दिखाएँ"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "डिफ़ॉल्ट (&D)"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "स्कोप प्रारंभ किया जा रहा है"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "डिफ़ॉल्ट गुणधर्म स्कोपः"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "स्लैश-स्लैश (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "डिफ़ॉल्ट संचालन स्कोपः"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "स्लैश-तारा (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "कोड तैयार करना"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "शैली:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "कोड बनाने के लिए विन्यास"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">सी++ कोड तैयार करना</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "कोड प्रदर्शक विन्यास"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "विधि मुख्य भाग तैयार करना"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "संचालन गुण"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "एब्सट्रैक्ट संचालन (&A)"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "क्लासीफॉयर स्कोप (\"स्थिर\") (&s)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "सदिश"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>चर</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "सुरक्षित (&e)"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "क्रियान्वयन"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "क्यू-स्ट्रिंग"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "पैरामीटर्स"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "स्ट्रिंग"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "नया पैरामीटर... (&w)"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">स्ट्रिंग</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "आपने एक अवैध पैरामीटर नाम भरा है."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">सूची</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "पैरामीटर नाम अवैध है"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"पैरामीटर नाम जो आपने चुना है\n"
-"इस संचालन में पहले से ही उपयोग में है."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>वैश्विक?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "पैरामीटर नाम बेजोड़ नहीं है"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "पैरामीटर नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "वर्ग नाम"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "आपने एक अवैध संचालन नाम भरा है."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">फ़ाइल सम्मिलित</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "अवैध संचालन नाम"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "परियोजना तैयार करना"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"%1 में उस हस्ताक्षर के साथ एक संचालन पहले ही मौज़ूद है.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "एएनटी बिल्ड दस्तावेज़ तैयार करें"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "एक भिन्न नाम या पैरामीटर सूची चुनें."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "विधियाँ स्वचलित तैयार करें"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "भूमिका ए गुण"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "कंस्ट्रक्टर विधियाँ खाली करें"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "भूमिका बी गुण"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, fuzzy, no-c-format
+msgid "Association accessor methods"
+msgstr "एक्सेसर विधियाँ"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "भूमिका ए दृश्यता"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, fuzzy, no-c-format
+msgid "Attribute accessor methods"
+msgstr "एक्सेसर विधियाँ तैयार करें"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "भूमिका बी दृश्यता"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "पैरेन्ट ऑब्जेक्ट से"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "भूमिका ए परिवर्तनीयता"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "डिफ़ॉल्ट गुणधर्म स्कोपः"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "भूमिका बी परिवर्तनीयता"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "डिफ़ॉल्ट संचालन स्कोपः"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "रखी हुई वस्तुएँ"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, fuzzy, no-c-format
+msgid "From Parent Role"
+msgstr "पैरेन्ट ऑब्जेक्ट से"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "टीप दस्तावेज़ीकरण"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">जावा कोड तैयार करना</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "नया गुणधर्म... (&e)"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "नया संचालन... (&e)"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "प्रारूप"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">सी++ कोड तैयार करना</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "नया टैम्प्लेट... (&e)"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "भाषा"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "ईन्यूम लिटरल्स"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "फ़ोल्डर"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "नया ईन्यूम लिटरल्स... (&e)"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "सभी तैयार फ़ाइलों को फ़ोल्डर में लिखें:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "गुणधर्म"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "ब्राउज़ करें... (&w)"
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "नया गुणधर्म... (&e)"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "ब्राउज... (&r)"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "आरंभिक गतिविधि"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "फ़ोल्डर से हेडिंग फ़ाइल शामिल करें... (&I)"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "क्रियाएँ बन्द"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "कोड ज़ेनरेटर द्वारा तैयार की गई फ़ाइलें इस फ़ोल्डर में लिखी जाएंगी"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "गतिविधि क़िस्मः"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "गतिविधि नामः"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "मिटाकर लिखने की नीति"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "विजेट रंग"
+#: 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/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "एट्रीब्यूट गुण"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "मिटाकर लिखें (&v)"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "आरंभिक मानः (&I)"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "सार्वजनिक (&P)"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "पूछें (&k)"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "आपने एक अवैध गुणधर्म नाम भरा है."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "अवैध गुणधर्म नाम"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "भिन्न नाम इस्तेमाल करें (&U)"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "गुणधर्म नाम जो आपने चुना है इस संचालन में पहले से ही उपयोग में है."
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "गुणधर्म नाम बेजोड़ नहीं है"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "फार्मेट किया जा रहा है"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "संचालन चुनें"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "लकीरें"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "अनुक्रम क्रमांक:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "पंक्ति ख़त्म होने की शैलीः"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "क्लास संचालन:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "हाशिया क़िस्मः"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "मनपसंद संचालन:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "हाशिए की मात्राः"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "आरेख (&D)"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, fuzzy, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
+"*निक्स (\"\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "फ़िल्टर"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr ""
+"विंडोज़ (\"\\r\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "मौज़ूदा आरेख (&C)"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "मैक (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "सभी आरेख (&A)"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "हाशिया नहीं"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "आरेख चुनें (&S)"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "टैब"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "आरेख क़िस्म (&T)"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "स्पेस"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "चयन"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "टिप्पणी वाचालता"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "साझेदारी"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "अनुक्रम"
+#: 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "डिपोलायमेंट दृश्य"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "कोई आरेख चुना नहीं गया."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "प्रदर्शक विकल्प"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "भाषा विकल्प"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "गुणधर्म विन्यास "
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "कोड बनाने का विज़ार्ड..."
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "संचालन विन्यास"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "वर्ग चुनें"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "टेम्प्लेट्स विन्यास"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "ईन्यूम लिटरल्स विन्यास"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "कोड बनाने के लिए वर्ग जोड़ें"
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "गुणधर्म विन्यास "
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "वर्ग चयनित"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "विषय-वस्तु विन्यास"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "कोड बनाने में से वर्ग मिटाएँ"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "सम्बद्धता"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "वर्ग उपलब्ध"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "वर्ग सम्बद्धता"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "कोड बनाने की स्थिति"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "संचालन (&n)"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "दृश्यता (&V)"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "बनाने की स्थिति"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "संचालन हस्ताक्षर (&p)"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "छुपे ब्लॉक्स दिखाएँ"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "पैकेज (&k)"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">अवयव नाम यहाँ</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "एट्रिब्यूट्स (&r)"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "स्टीरियोटाइप (&y)"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "ब्लॉक क़िस्म दिखाएँ"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "एट्रिब्यूट हस्ताक्षर (&i)"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "रंग"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "वृत्त की तरह आरेखित करें"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "फ़ॉन्टःः"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "आरंभिक अवस्था"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "कागजः"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "अंत अवस्था"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "चुना गयाः"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "अवस्था क़िस्मः"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">यूएमएल ऑब्जेक्ट ब्लॉक:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "अवस्था नामः"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">छुपे ब्लॉक:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "विजेट रंग"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">असंपादन योग्य पाठ:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "नया_वर्ग"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">संपादन योग्य पाठ:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "नया वर्ग"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "आरेख गुण"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "वर्ग गुणधर्म"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "ज़ूमः"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "क्लास संचालन"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "पैरामीटर गुण"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "ग्रिड दिखाएँ (&g)"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "ग्रिड में स्नेप करें (&t)"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "अवयव आकार स्नैप करें"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "बनाएँ (&G)"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "समाप्त"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "कोड बन गया"
-
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "नहीं बना"
-
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "अभी नहीं बना"
+#: dialogs/diagrampropertiespage.ui:257
+#, fuzzy, no-c-format
+msgid "Grid spacing:  "
+msgstr "ग्रिड स्पेसिंगः X"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
 msgstr ""
-"खोज डिरेक्ट्री %1 अभी तक उपलब्ध नहीं है. क्या आप निर्देशिका अभी तैयार करना "
-"चाहेंगे?"
-
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "आउटपुट डिरेक्ट्री अस्तित्व में नहीं है."
-
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "फ़ोल्डर बना नहीं सकता"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "फ़ाइल तैयार नहीं करें (&D)"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: 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."
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "डायरेक्टरी तैयार करने में त्रुटि"
-
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "कृपया वैध डिरेक्ट्री चुनें."
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+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/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "आउटपुट डिरेक्ट्री में लिखने में त्रुटि"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "कृपया वैध डिरेक्ट्री चुनें"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "अवस्था क़िस्मः"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "गंतव्य फ़ाइल पहले से मौज़ूद है"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "फ़ोल्डर"
 
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "सभी बची फ़ाइलों में लागू करें (&A)"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "मिटाकर लिखें (&O)"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "एक जैसे फ़ाइल नाम तैयार करें (&G)"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "फ़ाइल तैयार नहीं करें (&D)"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
 msgstr ""
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "गुणनता"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "गुणनता भरें:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "सम्बद्धता नाम"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "भूमिका परिवर्तनशीलता"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "सम्बद्धता नाम भरें:"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "भूमिका दृश्यता"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "भूमिका नाम"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "भूमिका नाम भरें:"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "सम्बद्धता नाम भरें:"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "आरेख (&D)"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "नया पाठ भरें:"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "नया (&N)"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "त्रुटि"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "दिखाएँ (&o)"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "पाठ बदलें"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "ज़ूमः"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr ""
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "कोड (&C)"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr ""
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "सक्रिय भाषा (&L)"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: 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 ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: 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 ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: 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 ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: 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 ""
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: 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 ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: 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 ""
 
-#: aligntoolbar.cpp:383
+#: tips:44
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:51
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "बाहर हो रहे..."
-
-#: umlviewimageexporter.cpp:50
+#: tips:63
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:71
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"फ़ाइल %1 पहले से ही मौजूद है. \n"
-"क्या आप इसके ऊपर लिखना चाहते हैं?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "फ़ाइल पहले से ही अस्तित्व में है"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "नया_अभिनेता"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "नया_यूज़केस"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "नया_पैकेज"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "नया_अवयव"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "नया_नोड"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "नया_शिल्पतथ्य"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "नया_इंटरफेस"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "नया_डाटाटाइप"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "नया_ईन्यूम"
-
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "नया_ईन्यूम"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "नया_नोड"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "नया_ऑब्जैक्ट"
-
-#: model_utils.cpp:559
-msgid "Empty"
+#: 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 ""
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: 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 ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: 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 ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: 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 ""
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "बेस वर्ग जोड़ें"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>कंट्रोल-A दबा कर आप सभी ऑब्जैक्ट्स का चयन कर सकते हैं.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "डिराइव्ड वर्ग जोड़ें"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "संचालन जोड़ें"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "एट्रिब्यूट जोड़ें"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "बेस इंटरफेस जोड़ें"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "डिराइव्ड इंटरफेस जोड़ें"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "बेस क्लॉसीफ़ायर्स"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "डिराइव्ड क्लासीफ़ायर्स"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "फ़ोल्डर बना नहीं सकता"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-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 "new_stereotype"
@@ -4064,7 +4161,8 @@ msgstr ""
 #~ msgid "Creates association relationships between UML elements"
 #~ msgstr "यूएमएल अवयवों के बीच असोशिएशन सम्बन्ध बनाता है"
 
-#~ msgid "Creates unidirectional association relationships between UML elements"
+#~ msgid ""
+#~ "Creates unidirectional association relationships between UML elements"
 #~ msgstr "यूएमएल अवयवों के बीच यूनिडायरेक्शनल असोशिएशन सम्बन्ध बनाता है"
 
 #, fuzzy
diff --git a/tde-i18n-hr/messages/tdesdk/umbrello.po b/tde-i18n-hr/messages/tdesdk/umbrello.po
index ddef92e9b36..aaf557fda29 100644
--- a/tde-i18n-hr/messages/tdesdk/umbrello.po
+++ b/tde-i18n-hr/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello 0\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-04-20 13:30+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -12,275 +12,220 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Autori Umbrello-a, UML modelara"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "datoteka za otvaranje"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Darko Bednjanec, Denis Lackovic, Nikola Planinac, Robert Pezer"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:2
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "Autori Umbrello-a, UML modelara"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "lokalizacija@linux.hr"
 
-#: docgenerators/main.cpp:67 main.cpp:98
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
 #, fuzzy
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autori Umbrello-a, UML modelara"
+msgid "Enter Activity Name"
+msgstr "Unesite ime za aktivnost"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
 #, fuzzy
-msgid "Exporting all views..."
-msgstr "Izvezi kao sliku..."
+msgid "Enter the name of the new activity:"
+msgstr "Unesite ime za novu aktivnost:"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
 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
-#, fuzzy, c-format
-msgid "There was a problem saving file: %1"
-msgstr "Došlo je do problema prilikom spremanja datotekaa: %1"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+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 "Spremi pogrešku"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr ""
 
-#: worktoolbar.cpp:246
-#, fuzzy
-msgid "Synchronous Message"
-msgstr "Sinhrona poruka"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
+msgstr ""
 
-#: worktoolbar.cpp:247
-#, fuzzy
-msgid "Asynchronous Message"
-msgstr "Asinhrona poruka"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
+msgstr ""
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "U vezi s"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
+msgstr ""
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
 msgstr ""
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Sidro"
+#: 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:251
-msgid "Label"
-msgstr "Oznaka"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Oblikovanje"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Bilješka"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kutija"
+#: association.cpp:84
+#, fuzzy
+msgid "Generalization"
+msgstr "Uopćenje"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Učesnik"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr "Agregacija"
 
 #: association.cpp:86 worktoolbar.cpp:255
 msgid "Dependency"
 msgstr "Ovisnosti"
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
-msgstr "Agregacija"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "U vezi s"
 
-#: worktoolbar.cpp:257
+#: association.cpp:88
 #, fuzzy
-msgid "Relationship"
-msgstr "Realizacija"
+msgid "Self Association"
+msgstr "Samopridruživanje"
 
-#: worktoolbar.cpp:258
-#, fuzzy
-msgid "Directional Association"
-msgstr "Unesite naziv objekta:"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr ""
 
-#: worktoolbar.cpp:259
-#, fuzzy
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementira (generalizacija-realizacija)"
+#: 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 "Sastavljanje poruka"
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-#, fuzzy
-msgid "Use Case"
-msgstr "Slučaj upotrebe"
-
-#. 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 "Klasa"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#: association.cpp:95
 #, fuzzy
-msgid "Initial State"
-msgstr "Početno stanje"
+msgid "Realization"
+msgstr "Realizacija"
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#: association.cpp:96
 #, fuzzy
-msgid "End State"
-msgstr "Završno stanje"
+msgid "Uni Association"
+msgstr "Jednostrano pridruživanje"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-#, fuzzy
-msgid "Branch/Merge"
-msgstr "Granaj/Stopi"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Sidro"
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+#: association.cpp:98 worktoolbar.cpp:284
 #, fuzzy
-msgid "Fork/Join"
-msgstr "Podeli/Spoji"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponenta"
+msgid "State Transition"
+msgstr "Prelaz stanja"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Čvor"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr "Aktivnost"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#: associationwidget.cpp:2328
 #, fuzzy
-msgid "Artifact"
-msgstr "Artifakt"
-
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Sučelje"
-
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "&podaci"
+msgid "Multiplicity"
+msgstr "Višestrukost"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
 #, fuzzy
-msgid "Enum"
-msgstr "Nabrajanje"
+msgid "Enter multiplicity:"
+msgstr "Unesite višestrukost:"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#: associationwidget.cpp:2346
 #, fuzzy
-msgid "Entity"
-msgstr "Završna aktivnost"
-
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr ""
-
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+msgid "Association Name"
+msgstr "Ime pridruživanja"
 
-#: worktoolbar.cpp:277
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 #, fuzzy
-msgid "Join"
-msgstr "Podeli/Spoji"
+msgid "Enter association name:"
+msgstr "Unesite ime pridruživanja:"
 
-#: worktoolbar.cpp:278
+#: associationwidget.cpp:2366
 #, fuzzy
-msgid "Fork"
-msgstr "Obrazac1"
+msgid "Role Name"
+msgstr "Ime uloge"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Unesite ime uloge:"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: association.cpp:98 worktoolbar.cpp:284
-#, fuzzy
-msgid "State Transition"
-msgstr "Prelaz stanja"
-
-#: worktoolbar.cpp:285
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
 #, fuzzy
-msgid "Activity Transition"
-msgstr "Prijelaz aktivnosti"
-
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
-msgstr "Aktivnost"
+msgid "That is an invalid name."
+msgstr "To ime nije ispravno."
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Država"
+#: 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 "Neispravno ime"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
 #, fuzzy
-msgid "End Activity"
-msgstr "Završna aktivnost"
+msgid "That name is already being used."
+msgstr "To ime se već koristi."
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#: 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
 #, fuzzy
-msgid "Initial Activity"
-msgstr "Početna aktivnost"
-
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Poruka"
-
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr ""
-
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Odaberi"
+msgid "Not a Unique Name"
+msgstr "Nije jedinstveno ime"
 
 #: clipboard/umlclipboard.cpp:687
 #, fuzzy
 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."
+"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 ""
-"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato jer stavka sa istim "
-"imenom već postoji. Sve ostale stavke su umetnute."
+"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato jer stavka sa "
+"istim imenom već postoji. Sve ostale stavke su umetnute."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 #, fuzzy
@@ -303,10 +248,8 @@ msgstr "Ne mogu otvoriti datoteka"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
 #, fuzzy
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ne mogu napraviti direktorij:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ne mogu napraviti direktorij:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 #, fuzzy
@@ -322,1364 +265,1685 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Ne mogu napraviti direktorij"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#: codegenerators/cppcodegenerationform.cpp:36
 #, fuzzy
-msgid "Enter State Name"
-msgstr "Unesite ime stanja"
+msgid "General Options"
+msgstr "Opće postavke"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+#: codegenerators/cppcodegenerationform.cpp:38
 #, fuzzy
-msgid "Enter the name of the new state:"
-msgstr "Unesite ime novog stanja:"
+msgid "Package is a namespace"
+msgstr "Paket je imenski prostor"
 
-#: statewidget.cpp:176
+#: codegenerators/cppcodegenerationform.cpp:41
 #, fuzzy
-msgid "Enter Activity"
-msgstr "Unesite aktivnost"
+msgid "Virtual destructors"
+msgstr "Virtualni razgrađivač"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
+#: codegenerators/cppcodegenerationform.cpp:44
 #, fuzzy
-msgid "Enter the name of the new activity:"
-msgstr "Unesite ime za novu aktivnost:"
+msgid "Generate empty constructors"
+msgstr "Generiraj prazne konstrusktore"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
+#: codegenerators/cppcodegenerationform.cpp:47
 #, fuzzy
-msgid "new activity"
-msgstr "nova aktivnost"
+msgid "Generate accessor methods"
+msgstr "Generiraj pristupne metode"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: codegenerators/cppcodegenerationform.cpp:50
 #, fuzzy
-msgid "UML Model"
-msgstr "Umbrello, UML modelar"
+msgid "Operations are inline"
+msgstr "Operacije su u liniji"
 
-#: umldoc.cpp:106
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Pristupnici su u liniji"
+
+#: codegenerators/cppcodegenerationform.cpp:57
 #, fuzzy
-msgid "Logical View"
-msgstr "Logički prikaz"
+msgid "Accessors are public"
+msgstr "Pristupnici su u liniji"
 
-#: umldoc.cpp:107
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
+
+#: 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 "Spreman."
+
+#: 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 "Use Case View"
-msgstr "Prikaz slučaja upotrebe"
+msgid "Namespace"
+msgstr "novi_paket"
 
-#: umldoc.cpp:108
+#: 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 "Klasa"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
+
+#: 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 "Component View"
-msgstr "Prikaz komponenti"
+msgid "Properties"
+msgstr "$Postavke..."
 
-#: umldoc.cpp:109
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "Deployment View"
-msgstr "Prikaz razvijanja"
+msgid "Initial activity"
+msgstr "Početna aktivnost"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr ""
+#: dialogs/activitydialog.cpp:70
+#, fuzzy
+msgid "End activity"
+msgstr "Završna aktivnost"
 
-#: umldoc.cpp:117 umldoc.cpp:293
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
 #, fuzzy
-msgid "Datatypes"
-msgstr "Vrste podataka"
+msgid "Branch/Merge"
+msgstr "Granaj/Stopi"
 
-#: umldoc.cpp:229
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
 #, fuzzy
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Trenutni datoteka je izmjenjen.\n"
-"Želite li da ga sačuvate?"
+msgid "Fork/Join"
+msgstr "Podeli/Spoji"
 
-#: umldoc.cpp:355
+#: 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 "Općenito"
+
+#: 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 "Opća svojstva"
+
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Vrsta aktivnosti:"
+
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ime aktivnosti:"
+
+#: 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 "Dokumentacija"
+
+#: 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 "The file %1 does not exist."
-msgstr "Datoteka %1 ne postoji."
+msgid "Font"
+msgstr "Pismo:"
 
-#: 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
+#: 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 "Postavke pisma"
+
+#: 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 "Boja"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
 #, fuzzy
-msgid "Load Error"
-msgstr "Greška pri učitavanju"
+msgid "Widget Colors"
+msgstr "Boje kontrole"
 
-#: umldoc.cpp:380
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivnosti"
+
+#: dialogs/activitypage.cpp:72
 #, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "Datoteka %1 ne postoji."
+msgid "New Activity..."
+msgstr "Nova aktivnost..."
 
-#: 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/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Izbriši odabrano"
 
-#: umldoc.cpp:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Preimenuj"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, fuzzy, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
+#: dialogs/activitypage.cpp:134
+#, fuzzy
+msgid "New Activity"
+msgstr "Nova aktivnost"
 
-#: umldoc.cpp:641
-#, fuzzy, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Došlo je do problema prilikom slanja datotekaa: %1"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+#, fuzzy
+msgid "new activity"
+msgstr "nova aktivnost"
 
-#: umldoc.cpp:934
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "use case diagram"
-msgstr "dijagram slučaja upotrebe"
+msgid "Rename Activity"
+msgstr "Promijeni ime aktivnosti"
 
-#: umldoc.cpp:936
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "class diagram"
-msgstr "dijagram klase"
+msgid "Enter the new name of the activity:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: umldoc.cpp:938
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tip:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
 #, fuzzy
-msgid "sequence diagram"
-msgstr "dijagram sekvence"
+msgid "Associations"
+msgstr "Pridruženja"
 
-#: umldoc.cpp:940
+#: dialogs/assocpropdlg.cpp:39
 #, fuzzy
-msgid "collaboration diagram"
-msgstr "dijagram saradnje"
+msgid "Association Properties"
+msgstr "Svojstva pridruživanja"
 
-#: umldoc.cpp:942
+#: 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 "Opće postavke"
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Funkcije"
+
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "state diagram"
-msgstr "dijagram stanja"
+msgid "Role Settings"
+msgstr "Postavke uloge"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "dijagram aktivnosti"
+#: dialogs/assocpropdlg.cpp:112
+#, fuzzy
+msgid "Association font"
+msgstr "Pismo pridruživanja"
 
-#: umldoc.cpp:946
+#: dialogs/assocrolepage.cpp:50
 #, fuzzy
-msgid "component diagram"
-msgstr "dijagram komponenti"
+msgid "Role A Properties"
+msgstr "Svojstva uloge „A“"
 
-#: umldoc.cpp:948
+#: dialogs/assocrolepage.cpp:51
 #, fuzzy
-msgid "deployment diagram"
-msgstr "dijagram razvijanja"
+msgid "Role B Properties"
+msgstr "Svojstva uloge „B“"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
+#: dialogs/assocrolepage.cpp:68
+#, fuzzy
+msgid "Role A Visibility"
+msgstr "Vidljivost uloge „A“"
 
-#: 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 "Ime"
+#: dialogs/assocrolepage.cpp:69
+#, fuzzy
+msgid "Role B Visibility"
+msgstr "Vidljivost uloge „B“"
 
-#: 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 "Unesite ime:"
+#: dialogs/assocrolepage.cpp:70
+#, fuzzy
+msgid "Role A Changeability"
+msgstr "Promenjljivost uloge „A“"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
+#: dialogs/assocrolepage.cpp:71
 #, fuzzy
-msgid "That is an invalid name for a diagram."
-msgstr "To je neispravno ime za dijagram."
+msgid "Role B Changeability"
+msgstr "Promenjljivost uloge „B“"
 
-#: 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 "Neispravno ime"
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, fuzzy, no-c-format
+msgid "Rolename:"
+msgstr "Ime uloge:"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Dijagram već koristi to ime."
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, no-c-format
+msgid "Multiplicity:"
+msgstr "Višestrukost:"
 
-#: 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
+#: 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 "Javno"
+
+#: 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 "Privatno"
+
+#: 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 "Zaštićeno"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Dokumentacija"
+
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, fuzzy, no-c-format
+msgid "Changeable"
+msgstr "Izmjenjivo"
+
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, no-c-format
+msgid "Frozen"
+msgstr "Zamrznut"
+
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, no-c-format
+msgid "Add only"
+msgstr "Dodaj samo"
+
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Ime Datoteke:"
+
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Ime &učesnika:"
+
+#: dialogs/classgenpage.cpp:54
 #, fuzzy
-msgid "Not a Unique Name"
-msgstr "Nije jedinstveno ime"
+msgid "Package &name:"
+msgstr "Ime &paketa:"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+#: dialogs/classgenpage.cpp:56
 #, fuzzy
-msgid "That is an invalid name."
-msgstr "To ime nije ispravno."
+msgid "Use case &name:"
+msgstr "&Ime slučaja upotrebe:"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
+#: dialogs/classgenpage.cpp:58
 #, fuzzy
-msgid "That name is already being used."
-msgstr "To ime se već koristi."
+msgid "Interface &name:"
+msgstr "Ime i&nterfejsa:"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
+#: dialogs/classgenpage.cpp:60
+#, fuzzy
+msgid "Component &name:"
+msgstr "Ime &komponente:"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
+#: dialogs/classgenpage.cpp:62
 #, fuzzy
-msgid "Name Not Unique"
-msgstr "Ime nije jedinstveno"
+msgid "Artifact &name:"
+msgstr "Ime &artifakta:"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/classgenpage.cpp:64
 #, fuzzy
-msgid "Use Name"
-msgstr "Slučaj upotrebe"
+msgid "Enum &name:"
+msgstr "I&me nabrajanja:"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/classgenpage.cpp:66
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Unesite ime stanja"
+msgid "Datatype &name:"
+msgstr "Ime tipa po&datka:"
 
-#: umldoc.cpp:1099
+#: dialogs/classgenpage.cpp:68
 #, fuzzy
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Jeste li sigurni da želite da obrišete dijagram %1?"
+msgid "Entity &name:"
+msgstr "I&me nabrajanja:"
 
-#: umldoc.cpp:1099
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
 #, fuzzy
-msgid "Delete Diagram"
-msgstr "Obriši dijagram"
+msgid "&Stereotype name:"
+msgstr "Ime &stereotipa:"
 
-#: umldoc.cpp:1573
+#: dialogs/classgenpage.cpp:107
 #, fuzzy
-msgid "Setting up the document..."
-msgstr "Postavljam dokument..."
+msgid "&Package name:"
+msgstr "Ime &paketa:"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&pstraktna klasa"
 
-#: umldoc.cpp:1638
+#: dialogs/classgenpage.cpp:123
 #, fuzzy
-msgid "Loading UML elements..."
-msgstr "Učitavam UML elemente..."
+msgid "A&bstract use case"
+msgstr "A&pstraktna klasa"
 
-#: umldoc.cpp:1811
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Izvršni"
+
+#: dialogs/classgenpage.cpp:138
 #, fuzzy
-msgid "Loading diagrams..."
-msgstr "Učitavam dijagrame..."
+msgid "Draw As"
+msgstr "Crtaj kao"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Uobičajeno"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Ispuni:"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Biblioteka"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tablica"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Vidljivost"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Javno"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&Privatno"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&Zaštićeno"
+
+#: dialogs/classgenpage.cpp:186
 #, fuzzy
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-dijagram"
+msgid "Imple&mentation"
+msgstr "&Dokumentacija"
 
-#: umldoc.cpp:2104
-#, fuzzy, c-format
-msgid "/autosave%1"
-msgstr "/automatsko spremanje%1"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Ime klase:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#, fuzzy
+msgid "Instance name:"
+msgstr "Ime primjerka:"
 
-#: umllistview.cpp:416
+#: dialogs/classgenpage.cpp:272
 #, fuzzy
-msgid "Enter Model Name"
-msgstr "Unesite ime stanja"
+msgid "Draw as actor"
+msgstr "Crtaj kao aktera"
 
-#: umllistview.cpp:417
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Višestruke instance"
+
+#: dialogs/classgenpage.cpp:284
 #, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "Unesite novo ime za aktivnost:"
+msgid "Show destruction"
+msgstr "Pokaži razgrađivanje"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Pogledi"
+#: dialogs/classgenpage.cpp:322
+#, fuzzy
+msgid "Component name:"
+msgstr "Ime komponente:"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
+#: dialogs/classgenpage.cpp:324
+#, fuzzy
+msgid "Node name:"
+msgstr "Ime čvora:"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
 #, fuzzy
-msgid "Name Not Valid"
-msgstr "Ime nije ispravno"
+msgid "Stereotype name:"
+msgstr "Ime stereotipa:"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 #, fuzzy
 msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
-"Ime koje ste unijeli nije jedinstveno!\n"
-"Proces pravljenja je obustavljen."
+"Ime koje ste odabrali\n"
+"već se koristi.\n"
+"Ime je resetovano."
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+#, fuzzy
+msgid "Name is Not Unique"
+msgstr "Ime nije jedinstveno"
 
-#: umllistview.cpp:2338
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributi"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Novi atribut..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Postupci"
+
+#: dialogs/classifierlistpage.cpp:42
 #, fuzzy
-msgid "Loading listview..."
-msgstr "Učitavam dijagrame..."
+msgid "N&ew Operation..."
+msgstr "N&ova operacija..."
 
-#: umllistview.cpp:2670
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Predlošci"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "&Novi predložak..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
 #, fuzzy
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Direktorij se mora prvo isprazniti da bi se obrisao."
+msgid "Enum Literals"
+msgstr "Literali nabrajanja"
 
-#: umllistview.cpp:2671
+#: dialogs/classifierlistpage.cpp:48
 #, fuzzy
-msgid "Folder Not Empty"
-msgstr "Direktorij nije prazan"
+msgid "N&ew Enum Literal..."
+msgstr "N&ovi literal nabrajanja..."
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "Atributi"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#: dialogs/classifierlistpage.cpp:51
 #, fuzzy
-msgid "Enter Activity Name"
-msgstr "Unesite ime za aktivnost"
+msgid "N&ew Entity Attribute..."
+msgstr "&Novi atribut..."
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
 #, fuzzy
-msgid "new state"
-msgstr "novo stanje"
+msgid "&Delete"
+msgstr "Izbriši odabrano"
 
-#: association.cpp:84
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "$Postavke..."
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Pokaži"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Postupci"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Vidljivost"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
 #, fuzzy
-msgid "Generalization"
-msgstr "Uopćenje"
+msgid "O&peration signature"
+msgstr "Potpis o&peracije"
 
-#: association.cpp:88
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Paket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&Atributi"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Stereotip"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
 #, fuzzy
-msgid "Self Association"
-msgstr "Samopridruživanje"
+msgid "Attr&ibute signature"
+msgstr "Potpis atr&ibuta"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr ""
+#: dialogs/classoptionspage.cpp:108
+#, fuzzy
+msgid "Draw as circle"
+msgstr "Crtaj kao krug"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Prikaz"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Mogućnosti prikaza"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/classpropdlg.cpp:179
+#, fuzzy
+msgid "Attribute Settings"
+msgstr "Postavke atributa"
 
-#: association.cpp:95
+#: dialogs/classpropdlg.cpp:187
 #, fuzzy
-msgid "Realization"
-msgstr "Realizacija"
+msgid "Operation Settings"
+msgstr "Postavke operacija"
 
-#: association.cpp:96
+#: dialogs/classpropdlg.cpp:195
 #, fuzzy
-msgid "Uni Association"
-msgstr "Jednostrano pridruživanje"
+msgid "Templates Settings"
+msgstr "Postavke predložak"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals Settings"
+msgstr "Postavke literala nabrajanja"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Grafikon"
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "Postavke atributa"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Novi"
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Postavke sadržaja"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Pokaži"
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents Settings"
+msgstr "Postavke sadržaja"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
-msgstr "&Kod"
+#: dialogs/classpropdlg.cpp:222
+#, fuzzy
+msgid "Class Associations"
+msgstr "Pridruženja klasa"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
-msgstr "Aktivni &jezik"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#, fuzzy
+msgid "new_class"
+msgstr "nova_klasa"
 
-#. 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 "Dokumentacija"
+#: dialogs/classwizard.cpp:54
+#, fuzzy
+msgid "New Class"
+msgstr "Nova klasa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, fuzzy, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Kroz-kroz (//)"
+#: dialogs/classwizard.cpp:59
+#, fuzzy
+msgid "Class Attributes"
+msgstr "Atributi klase"
+
+#: dialogs/classwizard.cpp:63
+#, fuzzy
+msgid "Class Operations"
+msgstr "Operacije klase"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, fuzzy, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Kroz-zvezdica (/**  */)"
+msgid "Code Generation Options"
+msgstr "Opcije za generiranje kôda"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "N&ačin"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Završetak"
 
-#. 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 "Općenito"
+#: dialogs/codegenerationwizard.cpp:132
+#, fuzzy
+msgid "Code Generated"
+msgstr "Kôd je generiran"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Method Body Generation"
-msgstr "Generiranje tela metoda"
+#: dialogs/codegenerationwizard.cpp:134
+#, fuzzy
+msgid "Not Generated"
+msgstr "Nije generiran"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Koristi sljedeće za klase u generiranom kôdu:"
+#: dialogs/codegenerationwizard.cpp:141
+#, fuzzy
+msgid "Not Yet Generated"
+msgstr "Još uvijek nije generiran"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr ""
+"Odabrani datoteka %1 postoji.\n"
+"Želite li da ga prebrišete?"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Varijabla</b>"
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Ne mogu napraviti direktorij"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "Ne&moj da praviš datoteka"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "QString"
-msgstr "QString"
+#: 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/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "niz znakova"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Ne mogu napraviti direktorij"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Znakovni niz</p>"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: 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/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, fuzzy, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, fuzzy, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globalno?</i>"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 se čini da nije direktorij. Molim, odaberite ispravan direktorij."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, fuzzy, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, fuzzy, no-c-format
-msgid "Class name"
-msgstr "Ime klase"
+msgid "Code Viewer"
+msgstr "Prikazivač koda"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, fuzzy, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<p align=\"center\">Uključni datoteka</p>"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+#, fuzzy
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Project Generation"
-msgstr "Generiranje projekta"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Dijagrami"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Napravi graditeljski ANT dokument"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtar"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, fuzzy, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Automatski generiraj metode"
+#: dialogs/diagramprintpage.cpp:48
+#, fuzzy
+msgid "&Current diagram"
+msgstr "&Trenutni dijagram"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, fuzzy, no-c-format
-msgid "Empty constructor methods"
-msgstr "Prazni konstruktorski metodi"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Svi dijagrami"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, fuzzy, no-c-format
-msgid "Association accessor methods"
-msgstr "Pristupni način"
+#: dialogs/diagramprintpage.cpp:57
+#, fuzzy
+msgid "&Select diagrams"
+msgstr "&Odaberi dijagram"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, fuzzy, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Pristupni način"
+#: dialogs/diagramprintpage.cpp:61
+#, fuzzy
+msgid "&Type of diagram"
+msgstr "&Vrsta dijagrama"
 
-#. 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 "Javno"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Odabir"
 
-#. 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 "Privatno"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+#, fuzzy
+msgid "Use Case"
+msgstr "Slučaj upotrebe"
 
-#. 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 "Zaštićeno"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Suradnja"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, fuzzy, no-c-format
-msgid "From Parent Object"
-msgstr "Iz roditeljskog objekta"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Slijed"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Uobičajeni opseg atributa:"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Država"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "Uobičajeni opseg operacije:"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, fuzzy, no-c-format
-msgid "From Parent Role"
-msgstr "Iz roditeljskog objekta"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "Prikaz razvijanja"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generiranje Java kôda</p>"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-dijagram"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
+#: dialogs/diagramprintpage.cpp:135
+#, fuzzy
+msgid "No diagrams selected."
+msgstr "Nema odabranih dijagrama."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Hash (#)"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "Dokumentacija napomene"
+
+#: dialogs/overwritedialogue.cpp:27
+#, fuzzy
+msgid "Destination File Already Exists"
+msgstr "Odredišni datoteka već postoji"
+
+#: dialogs/overwritedialogue.cpp:31
+#, fuzzy
+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."
 msgstr ""
+"Datoteka %1 već postoji u %2.\n"
+"\n"
+"Umbrello može da prebriše datoteka, napravi datoteka\n"
+"sosobnog imena ili da ga uopše i ne napravi."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
+#: dialogs/overwritedialogue.cpp:34
+#, fuzzy
+msgid "&Apply to all remaining files"
+msgstr "&Priizbornik na sve preostale datotekaove"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, fuzzy, no-c-format
-msgid "Code Generation Options"
-msgstr "Opcije za generiranje kôda"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Pr&epiši"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
+#: dialogs/overwritedialogue.cpp:39
+#, fuzzy
+msgid "&Generate Similar File Name"
+msgstr "&Napravi sosobno ime datotekaa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Mape"
+#: dialogs/overwritedialogue.cpp:40
+#, fuzzy
+msgid "&Do Not Generate File"
+msgstr "Ne&moj da praviš datoteka"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, fuzzy, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Zapiši sve generirane datotekaove u direktorij:"
+#: dialogs/parmpropdlg.cpp:35
+#, fuzzy
+msgid "Parameter Properties"
+msgstr "Svojstva parametra"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Potraži..."
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tip:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&Potraži..."
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Ime:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, fuzzy, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Uključi zaglavne datotekaove iz direktorija:"
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+#, fuzzy
+msgid "&Initial value:"
+msgstr "&Početna vrijednost:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, fuzzy, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
-"Datoteke napravljeni generatorom kôda biti će zapisani u ovaj direktorij"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, fuzzy, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Datoteke iz ovog direktorija će biti korišteni kao zaglavni datoteke u "
-"generiranom kôdu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, fuzzy, no-c-format
-msgid "Overwrite Policy"
-msgstr "Politika prebrisavanja"
+#: dialogs/pkgcontentspage.cpp:29
+#, fuzzy
+msgid "Contained Items"
+msgstr "Sadržane stavke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, fuzzy, 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 ""
-"Ako već postoji datoteka sa istim imenom kakvo \n"
-"generator kôda hoće treba koristiti za svoj izlazni datoteka:"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+#, fuzzy
+msgid "Select Operation"
+msgstr "Odaberite operaciju"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Prebriši"
+#: dialogs/selectopdlg.cpp:43
+#, fuzzy
+msgid "Sequence number:"
+msgstr "Broj sekvence:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, fuzzy, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr ""
-"Prebriši postojeće datotekaove ako oni postoje u odredišnom direktoriju"
+#: dialogs/selectopdlg.cpp:46
+#, fuzzy
+msgid "Class operation:"
+msgstr "Operacija klase:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Pitaj"
+#: dialogs/selectopdlg.cpp:54
+#, fuzzy
+msgid "Custom operation:"
+msgstr "Posebna operacija:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
-#, fuzzy, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Ako datoteka sa istim imenom već postoji, pitaj šta da radiš"
+#: dialogs/settingsdlg.cpp:30
+#, fuzzy
+msgid "Umbrello Setup"
+msgstr "Podešavanje Umbrello-a"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, fuzzy, no-c-format
-msgid "&Use a different name"
-msgstr "&Koristi drugačije ime"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Korisničko sučelje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, fuzzy, 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 ""
-"Ako datoteka već postoji u odredišnom direktoriju, odaberi drugo ime dodavanjem "
-"sufiksa na ime datotekaa"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface Settings"
+msgstr "Postavke korisničkog interfejsa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Oblikovanje"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Boja crte:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linije"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Uobičajena boja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
-msgstr "Stil kraja linije:"
+#: dialogs/settingsdlg.cpp:63
+#, fuzzy
+msgid "Fill color:"
+msgstr "Boja za popunjavanje:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, fuzzy, no-c-format
-msgid "Indentation type:"
-msgstr "Vrsta uvlačenja:"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "&Uobičajena boja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, fuzzy, no-c-format
-msgid "Indentation amount:"
-msgstr "Veličina uvlačenja:"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
-"*NIX (\"\n"
-"\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
+#: dialogs/settingsdlg.cpp:86
+#, fuzzy
+msgid "&Use fill color"
+msgstr "&Koristi boju za popunjavanje"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Windows (\"\\r\n"
-"\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, fuzzy, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/settingsdlg.cpp:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "&Uključi automatsko spremanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, fuzzy, no-c-format
-msgid "No Indentation"
-msgstr "Bez uvlačenja"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "dijagram stanja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Razmak"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Uobičajeni opseg operacije:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, fuzzy, no-c-format
-msgid "Comment Verbosity"
-msgstr "Opširnost komentara"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatsko spremanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, fuzzy, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+#: dialogs/settingsdlg.cpp:132
+#, fuzzy
+msgid "E&nable autosave"
+msgstr "&Uključi automatsko spremanje"
+
+#: dialogs/settingsdlg.cpp:136
+#, fuzzy
+msgid "Select auto-save time interval (mins):"
+msgstr "Odaberite period automatskog spremanja (minuti):"
+
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
 msgstr ""
-"Piši komentare &za odeljke iako je odeljak\n"
-"prazan"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, fuzzy, no-c-format
+#: 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 ""
-"Piše komentare za naznaku drugog odeljka (javni, privatni itd.) u klasi, čak i "
-"ako su odeljci prazni"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Piši dokumentaciju komentara čak iako su prazni"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Podizanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Piši komentare &za dokumentaciju klase i metoda čak iako su prazni"
+#: dialogs/settingsdlg.cpp:164
+#, fuzzy
+msgid "Sta&rtup logo"
+msgstr "Logo p&ri pokretanju"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Language Options"
-msgstr "Opcije jezika"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Savjet dana"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Čarobnjak za generiranje kôda"
+#: dialogs/settingsdlg.cpp:172
+#, fuzzy
+msgid "&Load last project"
+msgstr "&Učitaj posljednji projekat"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Select Classes"
-msgstr "Odaberite klase"
+#: dialogs/settingsdlg.cpp:176
+#, fuzzy
+msgid "Start new project with:"
+msgstr "Počni novi projekat:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, fuzzy, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
-msgstr ""
-"U popis desno smijestite sve klase za\n"
-"koje želite da se generiše kôd"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "No Diagram"
+msgstr "Bez dijagrama"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Dodaj klasu za izradu koda"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "Class Diagram"
+msgstr "Dijagram klasa"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, fuzzy, no-c-format
-msgid "Classes Selected"
-msgstr "Odabrane klase"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Use Case Diagram"
+msgstr "Dijagram slučaja upotrebe"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, fuzzy, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Ukloni klasu iz generiranja kôda"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Sequence Diagram"
+msgstr "Dijagram sekvenci"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, fuzzy, no-c-format
-msgid "Classes Available"
-msgstr "Dostupne klase"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "Collaboration Diagram"
+msgstr "Dijagram saradnje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, fuzzy, no-c-format
-msgid "Code Generation Status"
-msgstr "Status generiranja kôda"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "State Diagram"
+msgstr "Dijagram stanja"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Pritisnite gumb za generiranje za početak generiranja kôda"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Dijagram aktivnosti"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Generation Status"
-msgstr "Status generiranja"
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Component Diagram"
+msgstr "Dijagram komponenti"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "Prikazivač koda"
+#: dialogs/settingsdlg.cpp:187
+#, fuzzy
+msgid "Deployment Diagram"
+msgstr "Dijagram razvijanja"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, fuzzy, no-c-format
-msgid "Show hidden blocks"
-msgstr "Pokaži skrivene blokove"
+#: dialogs/settingsdlg.cpp:210
+#, fuzzy
+msgid "Class Settings"
+msgstr "Postavke klase"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">ovdje ide ime komponente</p>"
+#: dialogs/settingsdlg.cpp:217
+#, fuzzy
+msgid "Show &visibility"
+msgstr "Pokaži &vidljivost"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, fuzzy, no-c-format
-msgid "Show block type"
-msgstr "Pokaži vrstu bloka"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Prikaži osobine"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Boje"
+#: dialogs/settingsdlg.cpp:225
+#, fuzzy
+msgid "Show operations"
+msgstr "Pokaži operacije"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Pismo:"
+#: dialogs/settingsdlg.cpp:229
+#, fuzzy
+msgid "Show stereot&ype"
+msgstr "Pr&ikaži stereotip"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, fuzzy, no-c-format
-msgid "Paper:"
-msgstr "Papir:"
+#: dialogs/settingsdlg.cpp:233
+#, fuzzy
+msgid "Show attribute signature"
+msgstr "Pokaži potpis atributa"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Označeno"
+#: dialogs/settingsdlg.cpp:238
+#, fuzzy
+msgid "Show package"
+msgstr "Pokaži paket"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML blok objekta:</p>"
+msgid "Show operation signature"
+msgstr "Pokaži potpis operacije"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skriveni blok:</p>"
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr "Početni opseg"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Neizmjenljiv tekst:</p>"
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "Uobičajeni opseg atributa:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Urediv tekst:</p>"
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "Uobičajeni opseg operacije:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Svojstva dijagrama"
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation"
+msgstr "Generiranje kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ime:"
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation Settings"
+msgstr "Postavke generiranja kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zumiraj:"
+#: dialogs/settingsdlg.cpp:301
+#, fuzzy
+msgid "Code Viewer Settings"
+msgstr "Postavke prikazivača kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "Initial state"
+msgstr "Početno stanje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, fuzzy, no-c-format
-msgid "Show operation signature"
-msgstr "Pokaži potpis operacije"
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "End state"
+msgstr "Završno stanje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Prikaži rešetku"
+#: dialogs/statedialog.cpp:96
+#, fuzzy
+msgid "State type:"
+msgstr "Vrsta stanja:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Prijanjaj uz mrežu"
+#: dialogs/statedialog.cpp:101
+#, fuzzy
+msgid "State name:"
+msgstr "Ime stanja:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "Veličina komponente uklapanja"
+#: dialogs/statedialog.cpp:130
+#, fuzzy
+msgid "Widget Color"
+msgstr "Boja kontrole"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, fuzzy, no-c-format
+#: dialogs/umlattributedialog.cpp:42
+#, fuzzy
+msgid "Attribute Properties"
+msgstr "Svojstva atributa"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+#, fuzzy
+msgid "Classifier &scope (\"static\")"
+msgstr "Op&seg klasifikatora („static“)"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Javno"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Zaštićeno"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "&Dokumentacija"
+
+#: dialogs/umlattributedialog.cpp:155
+#, fuzzy
+msgid "You have entered an invalid attribute name."
+msgstr "Unijeli ste neispravno ime atributa."
+
+#: dialogs/umlattributedialog.cpp:156
+#, fuzzy
+msgid "Attribute Name Invalid"
+msgstr "Neispravno ime atributa"
+
+#: dialogs/umlattributedialog.cpp:163
+#, fuzzy
 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 ""
-"Postavlja veličinu komponente tako da ona bude umnožak razmaka u mreži.\n"
-"Ako je uključena opcija „uklapaj uz mrežu“ komponenta će uvijek biti poravnata "
-"sa mrežom na sve četiri strane."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr ""
+#: dialogs/umlattributedialog.cpp:164
+#, fuzzy
+msgid "Attribute Name Not Unique"
+msgstr "Ime atributa nije jedinstveno"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
+msgstr "Svojstva atributa"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "&Uobičajeno"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Izvezi kao sliku..."
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "Atributi"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Vrsta stanja:"
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "&Novi"
 
-#. 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:115
+#, fuzzy
+msgid "&Primary"
+msgstr "&Biblioteka"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "mapa"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+msgstr "Unijeli ste neispravno ime atributa."
+
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "Neispravno ime atributa"
+
+#: dialogs/umlentityattributedialog.cpp:192
+#, fuzzy
 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 "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
+
+#: dialogs/umlentityattributedialog.cpp:193
+#, fuzzy
+msgid "Entity Attribute Name Not Unique"
+msgstr "Ime atributa nije jedinstveno"
+
+#: dialogs/umloperationdialog.cpp:50
+#, fuzzy
+msgid "Operation Properties"
+msgstr "Svojstva operacija"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Apstraktna operacija"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametri"
+
+#: dialogs/umloperationdialog.cpp:141
+#, fuzzy
+msgid "Ne&w Parameter..."
+msgstr "No&vi parametar..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+#, fuzzy
+msgid "You have entered an invalid parameter name."
+msgstr "Unijeli ste neispravno ime za parametar."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+#, fuzzy
+msgid "Parameter Name Invalid"
+msgstr "Neispravno ime parametra"
+
+#: dialogs/umloperationdialog.cpp:339
+#, fuzzy
 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 ""
+"Ime koje ste odabrali za parametar\n"
+"već se koristi u ovoj operaciji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, fuzzy, no-c-format
-msgid "Role Properties"
-msgstr "Svojstva uloge"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+#, fuzzy
+msgid "Parameter Name Not Unique"
+msgstr "Ime parametra nije jedinstveno"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, fuzzy, no-c-format
-msgid "Rolename:"
-msgstr "Ime uloge:"
+#: dialogs/umloperationdialog.cpp:406
+#, fuzzy
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Višestrukost:"
+#: dialogs/umloperationdialog.cpp:456
+#, fuzzy
+msgid "You have entered an invalid operation name."
+msgstr "Unijeli ste neispravno ime operacije."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, fuzzy, no-c-format
-msgid "Role Changeability"
-msgstr "Izmjenljivost uloge"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+#, fuzzy
+msgid "Operation Name Invalid"
+msgstr "Neispravno ime operacije"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Dodaj samo"
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#, fuzzy
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operacija sa takvim potpisom već postoji u %1.\n"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zamrznut"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+#, fuzzy
+msgid "Choose a different name or parameter list."
+msgstr "Odaberite drugačije ime ili parametarsku popis."
 
-#. 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
 #, fuzzy, no-c-format
-msgid "Changeable"
-msgstr "Izmjenjivo"
+msgid "Role Properties"
+msgstr "Svojstva uloge"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, fuzzy, no-c-format
-msgid "Role Visibility"
-msgstr "Vidljivost uloge"
+#: dialogs/umltemplatedialog.cpp:36
+#, fuzzy
+msgid "Template Properties"
+msgstr "Svojstva predložak"
 
-#. 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 "Dokumentacija"
+#: dialogs/umltemplatedialog.cpp:128
+#, fuzzy
+msgid "You have entered an invalid template name."
+msgstr "Unijeli ste neispravno ime za šablon."
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:129
+#, fuzzy
+msgid "Template Name Invalid"
+msgstr "Neispravno ime za šablon"
 
-#: tips.txt:9
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
 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 ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "Ime parametra nije jedinstveno"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Classes Display Options"
+msgstr "Opcije za prikaz klasa"
 
-#: tips.txt:25
+#: dialogs/umlviewdialog.cpp:100
 #, fuzzy
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Ako želite u dijagram dodati klasu koja već postoji, samo prevucite njen "
-"unos iz stablolikog prikaza.</p>\n"
+msgid "Diagram Colors"
+msgstr "Boje za dijagram"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:164
+#, fuzzy
+msgid "The name you have entered is invalid."
+msgstr "Ime koje ste unijeli nije ispravno."
 
-#: tips.txt:37
+#: dialogs/umlviewdialog.cpp:170
 #, fuzzy
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
-"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
+msgid "The name you have entered is not unique."
+msgstr "Ime koje ste unijeli nije jedinstveno."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+#, fuzzy
+msgid "Name Not Unique"
+msgstr "Ime nije jedinstveno"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Redak:"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Ispuni:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Uobičajeno"
 
-#: tips.txt:60
+#: dialogs/umlwidgetcolorpage.cpp:78
 #, fuzzy
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Izreži i kopiraj će također izvesti sliku u PNG klipbord, odakle može biti "
-"umetnuta u KWord i druge programe.</p>\n"
+msgid "&Use fill"
+msgstr "&Koristi popunjavanje"
 
-#: tips.txt:66
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
 #, fuzzy
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+msgid "Exporting all views..."
+msgstr "Izvezi kao sliku..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
-"napraviti pomerljivu tačku.</p>\n"
 
-#: tips.txt:71
+#: 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
+#, fuzzy, c-format
+msgid "There was a problem saving file: %1"
+msgstr "Došlo je do problema prilikom spremanja datotekaa: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Spremi pogrešku"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Autori Umbrello-a, UML modelara"
+
+#: docgenerators/main.cpp:47
 #, fuzzy
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Automatsko spremanje možete uključiti u dijalogu za podešavanje "
-"Umbrello-a.</p>\n"
+msgid "File to transform"
+msgstr "datoteka za otvaranje"
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:86
+#: docgenerators/main.cpp:64
 #, fuzzy
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Sve odabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "Autori Umbrello-a, UML modelara"
 
-#: tips.txt:91
+#: docgenerators/main.cpp:67 main.cpp:98
 #, fuzzy
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Ako ste našli grešku u Umbrello-u, molimo vas da nas obavestite.\n"
-"Greške možete poslani alatom za prijavu grešaka iz izbornika Pomoć.</p>\n"
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autori Umbrello-a, UML modelara"
 
-#: tips.txt:97
+#: 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 "Ime"
+
+#: 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 "Unesite ime:"
+
+#: floatingtextwidget.cpp:112
 #, fuzzy
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Pritiskom na tipka Escape postavlja se trenutni alat na odabrani alat.\n"
-"Backspace-om se skače na prethodno korišteni alat.</p>\n"
+msgid "Enter operation name:"
+msgstr "Unesite ime pridruživanja:"
 
-#: tips.txt:103
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Unesite novi tekst:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "GREŠKA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Promijeni kut"
+
+#: folder.cpp:289
 #, fuzzy
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Možete odabrati sve objekte pritiskom na Ctrl-A.</p>\n"
+msgid "The folderfile %1 does not exist."
+msgstr "Datoteka %1 ne postoji."
+
+#: 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
+#, fuzzy
+msgid "Load Error"
+msgstr "Greška pri učitavanju"
 
-#: tips.txt:108
+#: folder.cpp:293
 #, fuzzy
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz izbornika "
-"Kôd.</p>\n"
+msgid "The folderfile %1 cannot be opened."
+msgstr "Datoteka %1 ne postoji."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1743,6 +2007,10 @@ msgstr "Nova operacija..."
 msgid "Select Operation..."
 msgstr "Odaberi operaciju..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Promijeni kut..."
@@ -1798,6 +2066,19 @@ msgstr "Novi"
 msgid "Rename..."
 msgstr "Promijeni ime..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Greška prilikom umetanja"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Boja crte..."
@@ -1828,15 +2109,28 @@ msgstr "Ne mogu napraviti direktorij"
 msgid "Import Classes..."
 msgstr "Uvezi klase..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#, fuzzy
+msgid "Artifact"
+msgstr "Artifakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
 msgid "Component Diagram..."
 msgstr "Dijagram komponenti..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Čvor"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 #, fuzzy
 msgid "Deployment Diagram..."
@@ -1846,11 +2140,20 @@ msgstr "Dijagram razvijanja..."
 msgid "Folder"
 msgstr "Mapa"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Završna aktivnost"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Dijagram saradnje..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Učesnik"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 #, fuzzy
 msgid "Use Case Diagram..."
@@ -1894,6 +2197,19 @@ msgstr "Novi atribut..."
 msgid "Export as Picture..."
 msgstr "Izvezi kao sliku..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Sučelje"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "&podaci"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#, fuzzy
+msgid "Enum"
+msgstr "Nabrajanje"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
 msgid "Class Diagram..."
@@ -1918,26 +2234,10 @@ msgstr "Dijagram sekvence..."
 msgid "Collaboration Diagram..."
 msgstr "Dijagram saradnje..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributi"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Postupci"
-
 #: 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 "Vidljivost"
-
 #: listpopupmenu.cpp:680
 #, fuzzy
 msgid "Operation Signature"
@@ -1952,11 +2252,6 @@ msgstr "Potpis atributa"
 msgid "Stereotype"
 msgstr "Stereotip"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Pokaži"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribut..."
@@ -1983,14 +2278,6 @@ msgstr "Boja ispune..."
 msgid "Use Fill Color"
 msgstr "Koristi boju popunjavanja"
 
-#: 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 "Boja"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Učesnik..."
@@ -2021,10 +2308,30 @@ msgstr "Nabrajanje..."
 msgid "Package..."
 msgstr "Paket..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#, fuzzy
+msgid "Initial State"
+msgstr "Početno stanje"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#, fuzzy
+msgid "End State"
+msgstr "Završno stanje"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Država..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#, fuzzy
+msgid "Initial Activity"
+msgstr "Početna aktivnost"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#, fuzzy
+msgid "End Activity"
+msgstr "Završna aktivnost"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -2074,6 +2381,14 @@ msgstr "Izbriši odabrano"
 msgid "Change Association Name..."
 msgstr "Promijeni ime pridruživanja..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 #, fuzzy
 msgid "Clear Diagram"
@@ -2111,8 +2426,8 @@ 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
@@ -2120,189 +2435,106 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "Autori Umbrello-a, UML modelara"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: model_utils.cpp:244
 #, fuzzy
-msgid "Incorrect use of associations."
-msgstr "Neispravno korištenje pridruživanja."
+msgid "new_actor"
+msgstr "novi_akter"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: model_utils.cpp:246
 #, fuzzy
-msgid "Association Error"
-msgstr "Greška pridruživanja"
+msgid "new_usecase"
+msgstr "novo_korištenje_slučaja"
 
-#: folder.cpp:289
+#: model_utils.cpp:248
 #, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Datoteka %1 ne postoji."
+msgid "new_package"
+msgstr "novi_paket"
 
-#: folder.cpp:293
+#: model_utils.cpp:250
 #, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Datoteka %1 ne postoji."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Darko Bednjanec, Denis Lackovic, Nikola Planinac, Robert Pezer"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "lokalizacija@linux.hr"
-
-#: 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 "Spreman."
-
-#: 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 ""
+msgid "new_component"
+msgstr "nova_komponenta"
 
-#: codeimport/import_utils.cpp:183
+#: model_utils.cpp:252
 #, fuzzy
-msgid "Namespace"
-msgstr "novi_paket"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+msgid "new_node"
+msgstr "novi_čvor"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr ""
+#: model_utils.cpp:254
+#, fuzzy
+msgid "new_artifact"
+msgstr "novi_artifakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
+#: model_utils.cpp:256
+#, fuzzy
+msgid "new_interface"
+msgstr "novi_interfejs"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+#: model_utils.cpp:258
+#, fuzzy
+msgid "new_datatype"
+msgstr "nova_vrsta_podataka"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr ""
+#: model_utils.cpp:260
+#, fuzzy
+msgid "new_enum"
+msgstr "novo_nabrajanje"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+#: model_utils.cpp:262
+#, fuzzy
+msgid "new_entity"
+msgstr "novo_nabrajanje"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "novi_čvor"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#, fuzzy
+msgid "new_association"
+msgstr "novo_pridruživanje"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: model_utils.cpp:268
+#, fuzzy
+msgid "new_object"
+msgstr "novi_objekt"
 
-#: 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"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: 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
@@ -2319,118 +2551,74 @@ msgstr "Unesite naziv objekta:"
 msgid "new_parameter"
 msgstr "novi_parametar"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-#, fuzzy
-msgid "General Options"
-msgstr "Opće postavke"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "Paket je imenski prostor"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Dodajte osnovnu klasu"
 
-#: codegenerators/cppcodegenerationform.cpp:41
-#, fuzzy
-msgid "Virtual destructors"
-msgstr "Virtualni razgrađivač"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Dodaj izvedenu klasu"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-#, fuzzy
-msgid "Generate empty constructors"
-msgstr "Generiraj prazne konstrusktore"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Postupak"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-#, fuzzy
-msgid "Generate accessor methods"
-msgstr "Generiraj pristupne metode"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Atributi"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-#, fuzzy
-msgid "Operations are inline"
-msgstr "Operacije su u liniji"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Dodaj osnovnu sučelje"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Pristupnici su u liniji"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Dodaj izvedeno sučelje"
 
-#: codegenerators/cppcodegenerationform.cpp:57
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
 #, fuzzy
-msgid "Accessors are public"
-msgstr "Pristupnici su u liniji"
+msgid "Base Classifiers"
+msgstr "Bazni klasifikatori"
 
-#: umlview.cpp:297 umlview.cpp:357
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
 #, fuzzy
-msgid "Diagram: %2 Page %1"
-msgstr "Dijagram: %2 stranica %1"
+msgid "Derived Classifiers"
+msgstr "Izvedeni klasifikatori"
 
-#: umlview.cpp:2578
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
 #, fuzzy
-msgid "Enter Diagram Name"
+msgid "Enter State Name"
 msgstr "Unesite ime stanja"
 
-#: umlview.cpp:2579
-#, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "Unesite novo ime za aktivnost:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Odabrali ste prisanje cijelog dijagrama.\n"
-"Da li ste sigurni?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Obristai dijagram?"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr ""
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr ""
-
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
 #, fuzzy
-msgid "new_association"
-msgstr "novo_pridruživanje"
+msgid "Enter the name of the new state:"
+msgstr "Unesite ime novog stanja:"
 
-#: umlcanvasobject.cpp:150
+#: statewidget.cpp:176
 #, fuzzy
-msgid "new_attribute"
-msgstr "novi_atribut"
-
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novi_predložak"
+msgid "Enter Activity"
+msgstr "Unesite aktivnost"
 
-#: umlcanvasobject.cpp:156
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_operation"
-msgstr "nova_operacija"
+msgid "Incorrect use of associations."
+msgstr "Neispravno korištenje pridruživanja."
 
-#: umlcanvasobject.cpp:159
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_literal"
-msgstr "novi_literal"
+msgid "Association Error"
+msgstr "Greška pridruživanja"
 
-#: umlcanvasobject.cpp:162
+#: toolbarstateother.cpp:148 umlview.cpp:2511
 #, fuzzy
-msgid "new_field"
-msgstr "novi_literal"
+msgid "new state"
+msgstr "novo stanje"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2609,11 +2797,6 @@ msgstr "Izv&ezi kao sliku..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Izvezi kao sliku..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "$Postavke..."
-
 #: uml.cpp:286
 #, fuzzy
 msgid "&Zoom Slider"
@@ -2703,14 +2886,21 @@ msgstr "&Dokumentacija"
 msgid "Opening file..."
 msgstr "Otvaram datoteku..."
 
+#: 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 "Stvaram novi dokument..."
 
 #: 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"
@@ -2738,6 +2928,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid ""
@@ -2747,6 +2941,10 @@ msgstr ""
 "Datoteka %1 postoji.\n"
 "Želite li da ga prebrišete?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2783,8 +2981,8 @@ msgstr "Ubacivanje sadržaja odlagališta..."
 
 #: 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
@@ -2846,1419 +3044,1321 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr "Odaberite klase za uvoz"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Ime Datoteke:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Ime &učesnika:"
-
-#: dialogs/classgenpage.cpp:54
+#: umlcanvasobject.cpp:150
 #, fuzzy
-msgid "Package &name:"
-msgstr "Ime &paketa:"
+msgid "new_attribute"
+msgstr "novi_atribut"
 
-#: dialogs/classgenpage.cpp:56
-#, fuzzy
-msgid "Use case &name:"
-msgstr "&Ime slučaja upotrebe:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novi_predložak"
 
-#: dialogs/classgenpage.cpp:58
+#: umlcanvasobject.cpp:156
 #, fuzzy
-msgid "Interface &name:"
-msgstr "Ime i&nterfejsa:"
+msgid "new_operation"
+msgstr "nova_operacija"
 
-#: dialogs/classgenpage.cpp:60
+#: umlcanvasobject.cpp:159
 #, fuzzy
-msgid "Component &name:"
-msgstr "Ime &komponente:"
+msgid "new_literal"
+msgstr "novi_literal"
 
-#: dialogs/classgenpage.cpp:62
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Artifact &name:"
-msgstr "Ime &artifakta:"
+msgid "new_field"
+msgstr "novi_literal"
 
-#: dialogs/classgenpage.cpp:64
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "Enum &name:"
-msgstr "I&me nabrajanja:"
+msgid "UML Model"
+msgstr "Umbrello, UML modelar"
 
-#: dialogs/classgenpage.cpp:66
+#: umldoc.cpp:106
 #, fuzzy
-msgid "Datatype &name:"
-msgstr "Ime tipa po&datka:"
+msgid "Logical View"
+msgstr "Logički prikaz"
 
-#: dialogs/classgenpage.cpp:68
+#: umldoc.cpp:107
 #, fuzzy
-msgid "Entity &name:"
-msgstr "I&me nabrajanja:"
+msgid "Use Case View"
+msgstr "Prikaz slučaja upotrebe"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#: umldoc.cpp:108
 #, fuzzy
-msgid "&Stereotype name:"
-msgstr "Ime &stereotipa:"
+msgid "Component View"
+msgstr "Prikaz komponenti"
 
-#: dialogs/classgenpage.cpp:107
+#: umldoc.cpp:109
 #, fuzzy
-msgid "&Package name:"
-msgstr "Ime &paketa:"
+msgid "Deployment View"
+msgstr "Prikaz razvijanja"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&pstraktna klasa"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:117 umldoc.cpp:293
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "A&pstraktna klasa"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Izvršni"
+msgid "Datatypes"
+msgstr "Vrste podataka"
 
-#: dialogs/classgenpage.cpp:138
+#: umldoc.cpp:229
 #, fuzzy
-msgid "Draw As"
-msgstr "Crtaj kao"
-
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Uobičajeno"
-
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Biblioteka"
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Trenutni datoteka je izmjenjen.\n"
+"Želite li da ga sačuvate?"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tablica"
+#: umldoc.cpp:355
+#, fuzzy
+msgid "The file %1 does not exist."
+msgstr "Datoteka %1 ne postoji."
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Javno"
+#: umldoc.cpp:380
+#, fuzzy
+msgid "The file %1 seems to be corrupted."
+msgstr "Datoteka %1 ne postoji."
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&Privatno"
+#: 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:182
-msgid "Pro&tected"
-msgstr "&Zaštićeno"
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "&Dokumentacija"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Ime klase:"
+#: umldoc.cpp:641
+#, fuzzy, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Došlo je do problema prilikom slanja datotekaa: %1"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#: umldoc.cpp:934
 #, fuzzy
-msgid "Instance name:"
-msgstr "Ime primjerka:"
+msgid "use case diagram"
+msgstr "dijagram slučaja upotrebe"
 
-#: dialogs/classgenpage.cpp:272
+#: umldoc.cpp:936
 #, fuzzy
-msgid "Draw as actor"
-msgstr "Crtaj kao aktera"
-
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Višestruke instance"
+msgid "class diagram"
+msgstr "dijagram klase"
 
-#: dialogs/classgenpage.cpp:284
+#: umldoc.cpp:938
 #, fuzzy
-msgid "Show destruction"
-msgstr "Pokaži razgrađivanje"
+msgid "sequence diagram"
+msgstr "dijagram sekvence"
 
-#: dialogs/classgenpage.cpp:322
+#: umldoc.cpp:940
 #, fuzzy
-msgid "Component name:"
-msgstr "Ime komponente:"
+msgid "collaboration diagram"
+msgstr "dijagram saradnje"
 
-#: dialogs/classgenpage.cpp:324
+#: umldoc.cpp:942
 #, fuzzy
-msgid "Node name:"
-msgstr "Ime čvora:"
+msgid "state diagram"
+msgstr "dijagram stanja"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-#, fuzzy
-msgid "Stereotype name:"
-msgstr "Ime stereotipa:"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "dijagram aktivnosti"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:946
 #, fuzzy
-msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-"Ime koje ste odabrali\n"
-"već se koristi.\n"
-"Ime je resetovano."
+msgid "component diagram"
+msgstr "dijagram komponenti"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
+#: umldoc.cpp:948
 #, fuzzy
-msgid "Name is Not Unique"
-msgstr "Ime nije jedinstveno"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Redak:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Ispuni:"
+msgid "deployment diagram"
+msgstr "dijagram razvijanja"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Uobičajeno"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:78
+#: umldoc.cpp:984 umldoc.cpp:1017
 #, fuzzy
-msgid "&Use fill"
-msgstr "&Koristi popunjavanje"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivnosti"
+msgid "That is an invalid name for a diagram."
+msgstr "To je neispravno ime za dijagram."
 
-#: dialogs/activitypage.cpp:72
-#, fuzzy
-msgid "New Activity..."
-msgstr "Nova aktivnost..."
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Dijagram već koristi to ime."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Preimenuj"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
 
-#: dialogs/activitypage.cpp:134
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "New Activity"
-msgstr "Nova aktivnost"
+msgid "Use Name"
+msgstr "Slučaj upotrebe"
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "Rename Activity"
-msgstr "Promijeni ime aktivnosti"
+msgid "Enter New Name"
+msgstr "Unesite ime stanja"
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "Enter the new name of the activity:"
-msgstr "Unesite novo ime za aktivnost:"
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Jeste li sigurni da želite da obrišete dijagram %1?"
 
-#: dialogs/assocpropdlg.cpp:39
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "Association Properties"
-msgstr "Svojstva pridruživanja"
-
-#: 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 "Opće postavke"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Funkcije"
+msgid "Delete Diagram"
+msgstr "Obriši dijagram"
 
-#: dialogs/assocpropdlg.cpp:94
+#: umldoc.cpp:1573
 #, fuzzy
-msgid "Role Settings"
-msgstr "Postavke uloge"
+msgid "Setting up the document..."
+msgstr "Postavljam dokument..."
 
-#: 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 "Postavke pisma"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
+#: umldoc.cpp:1638
 #, fuzzy
-msgid "Association font"
-msgstr "Pismo pridruživanja"
+msgid "Loading UML elements..."
+msgstr "Učitavam UML elemente..."
 
-#: dialogs/umltemplatedialog.cpp:36
+#: umldoc.cpp:1811
 #, fuzzy
-msgid "Template Properties"
-msgstr "Svojstva predložak"
-
-#: 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 "Opća svojstva"
+msgid "Loading diagrams..."
+msgstr "Učitavam dijagrame..."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tip:"
+#: umldoc.cpp:2104
+#, fuzzy, c-format
+msgid "/autosave%1"
+msgstr "/automatsko spremanje%1"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Ime:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:128
+#: umllistview.cpp:416
 #, fuzzy
-msgid "You have entered an invalid template name."
-msgstr "Unijeli ste neispravno ime za šablon."
+msgid "Enter Model Name"
+msgstr "Unesite ime stanja"
 
-#: dialogs/umltemplatedialog.cpp:129
+#: umllistview.cpp:417
 #, fuzzy
-msgid "Template Name Invalid"
-msgstr "Neispravno ime za šablon"
+msgid "Enter the new name of the model:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: dialogs/umltemplatedialog.cpp:138
-#, fuzzy
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Pogledi"
 
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "Ime parametra nije jedinstveno"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
 #, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Svojstva atributa"
+msgid "Name Not Valid"
+msgstr "Ime nije ispravno"
 
-#: dialogs/umlentityattributedialog.cpp:73
+#: umllistview.cpp:1923 umllistview.cpp:2160
 #, fuzzy
-msgid "&Default value:"
-msgstr "&Uobičajeno"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
+"Ime koje ste unijeli nije jedinstveno!\n"
+"Proces pravljenja je obustavljen."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Attributes:"
-msgstr "Atributi"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr ""
+msgid "Loading listview..."
+msgstr "Učitavam dijagrame..."
 
-#: dialogs/umlentityattributedialog.cpp:112
+#: umllistview.cpp:2670
 #, fuzzy
-msgid "&None"
-msgstr "&Novi"
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Direktorij se mora prvo isprazniti da bi se obrisao."
 
-#: dialogs/umlentityattributedialog.cpp:115
+#: umllistview.cpp:2671
 #, fuzzy
-msgid "&Primary"
-msgstr "&Biblioteka"
+msgid "Folder Not Empty"
+msgstr "Direktorij nije prazan"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-#, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "Unijeli ste neispravno ime atributa."
-
-#: dialogs/umlentityattributedialog.cpp:185
-#, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "Neispravno ime atributa"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
-#, fuzzy
+#: umllistviewitem.cpp:478
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
-
-#: dialogs/umlentityattributedialog.cpp:193
-#, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "Ime atributa nije jedinstveno"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Prikaz"
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
+#: umlview.cpp:297 umlview.cpp:357
 #, fuzzy
-msgid "Classes Display Options"
-msgstr "Opcije za prikaz klasa"
+msgid "Diagram: %2 Page %1"
+msgstr "Dijagram: %2 stranica %1"
 
-#: dialogs/umlviewdialog.cpp:100
+#: umlview.cpp:2578
 #, fuzzy
-msgid "Diagram Colors"
-msgstr "Boje za dijagram"
+msgid "Enter Diagram Name"
+msgstr "Unesite ime stanja"
 
-#: dialogs/umlviewdialog.cpp:164
+#: umlview.cpp:2579
 #, fuzzy
-msgid "The name you have entered is invalid."
-msgstr "Ime koje ste unijeli nije ispravno."
+msgid "Enter the new name of the diagram:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: dialogs/umlviewdialog.cpp:170
-#, fuzzy
-msgid "The name you have entered is not unique."
-msgstr "Ime koje ste unijeli nije jedinstveno."
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Odabrali ste prisanje cijelog dijagrama.\n"
+"Da li ste sigurni?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tip:"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Obristai dijagram?"
 
-#: dialogs/settingsdlg.cpp:30
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Umbrello Setup"
-msgstr "Podešavanje Umbrello-a"
+msgid "Exporting view..."
+msgstr "Izlazim..."
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Korisničko sučelje"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-#, fuzzy
-msgid "User Interface Settings"
-msgstr "Postavke korisničkog interfejsa"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Odabrana datoteka %1 postoji.\n"
+"Želite je prepisati?"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Boja crte:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Datoteka već postoji"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Uobičajena boja"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Ne mogu napraviti direktorij"
 
-#: dialogs/settingsdlg.cpp:63
-#, fuzzy
-msgid "Fill color:"
-msgstr "Boja za popunjavanje:"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Nije moguće snimiti prazan dijagram"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "&Uobičajena boja"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
+#: 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:81
-msgid "D&efault Width"
+#: 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:86
-#, fuzzy
-msgid "&Use fill color"
-msgstr "&Koristi boju za popunjavanje"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:108
+#: worktoolbar.cpp:246
 #, fuzzy
-msgid "Enable undo"
-msgstr "&Uključi automatsko spremanje"
+msgid "Synchronous Message"
+msgstr "Sinhrona poruka"
 
-#: dialogs/settingsdlg.cpp:112
+#: worktoolbar.cpp:247
 #, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "dijagram stanja"
+msgid "Asynchronous Message"
+msgstr "Asinhrona poruka"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr ""
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Oznaka"
 
-#: dialogs/settingsdlg.cpp:120
-#, fuzzy
-msgid "Use angular association lines"
-msgstr "Uobičajeni opseg operacije:"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Bilješka"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatsko spremanje"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kutija"
 
-#: dialogs/settingsdlg.cpp:132
+#: worktoolbar.cpp:257
 #, fuzzy
-msgid "E&nable autosave"
-msgstr "&Uključi automatsko spremanje"
+msgid "Relationship"
+msgstr "Realizacija"
 
-#: dialogs/settingsdlg.cpp:136
+#: worktoolbar.cpp:258
 #, fuzzy
-msgid "Select auto-save time interval (mins):"
-msgstr "Odaberite period automatskog spremanja (minuti):"
+msgid "Directional Association"
+msgstr "Unesite naziv objekta:"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr ""
+#: worktoolbar.cpp:259
+#, fuzzy
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementira (generalizacija-realizacija)"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Podizanje"
-
-#: dialogs/settingsdlg.cpp:164
-#, fuzzy
-msgid "Sta&rtup logo"
-msgstr "Logo p&ri pokretanju"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Savjet dana"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "&Load last project"
-msgstr "&Učitaj posljednji projekat"
+msgid "Join"
+msgstr "Podeli/Spoji"
 
-#: dialogs/settingsdlg.cpp:176
+#: worktoolbar.cpp:278
 #, fuzzy
-msgid "Start new project with:"
-msgstr "Počni novi projekat:"
+msgid "Fork"
+msgstr "Obrazac1"
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "No Diagram"
-msgstr "Bez dijagrama"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "Class Diagram"
-msgstr "Dijagram klasa"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
+#: worktoolbar.cpp:285
 #, fuzzy
-msgid "Use Case Diagram"
-msgstr "Dijagram slučaja upotrebe"
+msgid "Activity Transition"
+msgstr "Prijelaz aktivnosti"
 
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Sequence Diagram"
-msgstr "Dijagram sekvenci"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Poruka"
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "Collaboration Diagram"
-msgstr "Dijagram saradnje"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "State Diagram"
-msgstr "Dijagram stanja"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Odaberi"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Dijagram aktivnosti"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Component Diagram"
-msgstr "Dijagram komponenti"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-#, fuzzy
-msgid "Deployment Diagram"
-msgstr "Dijagram razvijanja"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-#, fuzzy
-msgid "Class Settings"
-msgstr "Postavke klase"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-#, fuzzy
-msgid "Show &visibility"
-msgstr "Pokaži &vidljivost"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Pokaži operacije"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Prikaži osobine"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-#, fuzzy
-msgid "Show operations"
-msgstr "Pokaži operacije"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Očisti dijagram"
 
-#: dialogs/settingsdlg.cpp:229
-#, fuzzy
-msgid "Show stereot&ype"
-msgstr "Pr&ikaži stereotip"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-#, fuzzy
-msgid "Show attribute signature"
-msgstr "Pokaži potpis atributa"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Uopćenje"
 
-#: dialogs/settingsdlg.cpp:238
-#, fuzzy
-msgid "Show package"
-msgstr "Pokaži paket"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
-msgstr "Početni opseg"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "Uobičajeni opseg atributa:"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Ime pridruživanja"
 
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "Uobičajeni opseg operacije:"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation"
-msgstr "Generiranje kôda"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation Settings"
-msgstr "Postavke generiranja kôda"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-#, fuzzy
-msgid "Code Viewer Settings"
-msgstr "Postavke prikazivača kôda"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Uobičajeno"
 
-#: dialogs/umloperationdialog.cpp:50
-#, fuzzy
-msgid "Operation Properties"
-msgstr "Svojstva operacija"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Apstraktna operacija"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, fuzzy, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Kroz-kroz (//)"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-#, fuzzy
-msgid "Classifier &scope (\"static\")"
-msgstr "Op&seg klasifikatora („static“)"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, fuzzy, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Kroz-zvezdica (/**  */)"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Zaštićeno"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Dokumentacija"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, fuzzy, no-c-format
+msgid "Method Body Generation"
+msgstr "Generiranje tela metoda"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametri"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, fuzzy, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Koristi sljedeće za klase u generiranom kôdu:"
 
-#: dialogs/umloperationdialog.cpp:141
-#, fuzzy
-msgid "Ne&w Parameter..."
-msgstr "No&vi parametar..."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, fuzzy, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-#, fuzzy
-msgid "You have entered an invalid parameter name."
-msgstr "Unijeli ste neispravno ime za parametar."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-#, fuzzy
-msgid "Parameter Name Invalid"
-msgstr "Neispravno ime parametra"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, fuzzy, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Varijabla</b>"
 
-#: dialogs/umloperationdialog.cpp:339
-#, fuzzy
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Ime koje ste odabrali za parametar\n"
-"već se koristi u ovoj operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-#, fuzzy
-msgid "Parameter Name Not Unique"
-msgstr "Ime parametra nije jedinstveno"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, fuzzy, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:406
-#, fuzzy
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "niz znakova"
 
-#: dialogs/umloperationdialog.cpp:456
-#, fuzzy
-msgid "You have entered an invalid operation name."
-msgstr "Unijeli ste neispravno ime operacije."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Znakovni niz</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-#, fuzzy
-msgid "Operation Name Invalid"
-msgstr "Neispravno ime operacije"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-#, fuzzy
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Operacija sa takvim potpisom već postoji u %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, fuzzy, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-#, fuzzy
-msgid "Choose a different name or parameter list."
-msgstr "Odaberite drugačije ime ili parametarsku popis."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, fuzzy, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globalno?</i>"
 
-#: dialogs/assocrolepage.cpp:50
-#, fuzzy
-msgid "Role A Properties"
-msgstr "Svojstva uloge „A“"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, fuzzy, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/assocrolepage.cpp:51
-#, fuzzy
-msgid "Role B Properties"
-msgstr "Svojstva uloge „B“"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, fuzzy, no-c-format
+msgid "Class name"
+msgstr "Ime klase"
 
-#: dialogs/assocrolepage.cpp:68
-#, fuzzy
-msgid "Role A Visibility"
-msgstr "Vidljivost uloge „A“"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, fuzzy, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<p align=\"center\">Uključni datoteka</p>"
 
-#: dialogs/assocrolepage.cpp:69
-#, fuzzy
-msgid "Role B Visibility"
-msgstr "Vidljivost uloge „B“"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Project Generation"
+msgstr "Generiranje projekta"
 
-#: dialogs/assocrolepage.cpp:70
-#, fuzzy
-msgid "Role A Changeability"
-msgstr "Promenjljivost uloge „A“"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Napravi graditeljski ANT dokument"
 
-#: dialogs/assocrolepage.cpp:71
-#, fuzzy
-msgid "Role B Changeability"
-msgstr "Promenjljivost uloge „B“"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Automatski generiraj metode"
 
-#: dialogs/pkgcontentspage.cpp:29
-#, fuzzy
-msgid "Contained Items"
-msgstr "Sadržane stavke"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, fuzzy, no-c-format
+msgid "Empty constructor methods"
+msgstr "Prazni konstruktorski metodi"
 
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "Dokumentacija napomene"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, fuzzy, no-c-format
+msgid "Association accessor methods"
+msgstr "Pristupni način"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Novi atribut..."
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, fuzzy, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Pristupni način"
 
-#: dialogs/classifierlistpage.cpp:42
-#, fuzzy
-msgid "N&ew Operation..."
-msgstr "N&ova operacija..."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, fuzzy, no-c-format
+msgid "From Parent Object"
+msgstr "Iz roditeljskog objekta"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Predlošci"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Uobičajeni opseg atributa:"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "&Novi predložak..."
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "Uobičajeni opseg operacije:"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals"
-msgstr "Literali nabrajanja"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, fuzzy, no-c-format
+msgid "From Parent Role"
+msgstr "Iz roditeljskog objekta"
 
-#: dialogs/classifierlistpage.cpp:48
-#, fuzzy
-msgid "N&ew Enum Literal..."
-msgstr "N&ovi literal nabrajanja..."
+#: codegenerators/javacodegenerationformbase.ui:269
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generiranje Java kôda</p>"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Atributi"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "&Novi atribut..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "Initial activity"
-msgstr "Početna aktivnost"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "End activity"
-msgstr "Završna aktivnost"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Vrsta aktivnosti:"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Mape"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ime aktivnosti:"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, fuzzy, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Zapiši sve generirane datotekaove u direktorij:"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-#, fuzzy
-msgid "Widget Colors"
-msgstr "Boje kontrole"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Potraži..."
 
-#: dialogs/umlattributedialog.cpp:42
-#, fuzzy
-msgid "Attribute Properties"
-msgstr "Svojstva atributa"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&Potraži..."
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-#, fuzzy
-msgid "&Initial value:"
-msgstr "&Početna vrijednost:"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Uključi zaglavne datotekaove iz direktorija:"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Javno"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, fuzzy, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Datoteke napravljeni generatorom kôda biti će zapisani u ovaj direktorij"
 
-#: dialogs/umlattributedialog.cpp:155
-#, fuzzy
-msgid "You have entered an invalid attribute name."
-msgstr "Unijeli ste neispravno ime atributa."
+#: dialogs/codegenerationoptionsbase.ui:153
+#, fuzzy, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Datoteke iz ovog direktorija će biti korišteni kao zaglavni datoteke u "
+"generiranom kôdu"
 
-#: dialogs/umlattributedialog.cpp:156
-#, fuzzy
-msgid "Attribute Name Invalid"
-msgstr "Neispravno ime atributa"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, fuzzy, no-c-format
+msgid "Overwrite Policy"
+msgstr "Politika prebrisavanja"
 
-#: dialogs/umlattributedialog.cpp:163
-#, fuzzy
+#: dialogs/codegenerationoptionsbase.ui:214
+#, fuzzy, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
+msgstr ""
+"Ako već postoji datoteka sa istim imenom kakvo \n"
+"generator kôda hoće treba koristiti za svoj izlazni datoteka:"
 
-#: dialogs/umlattributedialog.cpp:164
-#, fuzzy
-msgid "Attribute Name Not Unique"
-msgstr "Ime atributa nije jedinstveno"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Prebriši"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "Odaberite operaciju"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, fuzzy, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
+"Prebriši postojeće datotekaove ako oni postoje u odredišnom direktoriju"
 
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "Broj sekvence:"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Pitaj"
 
-#: dialogs/selectopdlg.cpp:46
-#, fuzzy
-msgid "Class operation:"
-msgstr "Operacija klase:"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, fuzzy, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Ako datoteka sa istim imenom već postoji, pitaj šta da radiš"
 
-#: dialogs/selectopdlg.cpp:54
-#, fuzzy
-msgid "Custom operation:"
-msgstr "Posebna operacija:"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, fuzzy, no-c-format
+msgid "&Use a different name"
+msgstr "&Koristi drugačije ime"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Dijagrami"
+#: dialogs/codegenerationoptionsbase.ui:251
+#, fuzzy, 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 ""
+"Ako datoteka već postoji u odredišnom direktoriju, odaberi drugo ime "
+"dodavanjem sufiksa na ime datotekaa"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtar"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Oblikovanje"
 
-#: dialogs/diagramprintpage.cpp:48
-#, fuzzy
-msgid "&Current diagram"
-msgstr "&Trenutni dijagram"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linije"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Svi dijagrami"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "Stil kraja linije:"
 
-#: dialogs/diagramprintpage.cpp:57
-#, fuzzy
-msgid "&Select diagrams"
-msgstr "&Odaberi dijagram"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, fuzzy, no-c-format
+msgid "Indentation type:"
+msgstr "Vrsta uvlačenja:"
 
-#: dialogs/diagramprintpage.cpp:61
-#, fuzzy
-msgid "&Type of diagram"
-msgstr "&Vrsta dijagrama"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, fuzzy, no-c-format
+msgid "Indentation amount:"
+msgstr "Veličina uvlačenja:"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Odabir"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, fuzzy, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
+"*NIX (\"\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Suradnja"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr ""
+"Windows (\"\\r\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Slijed"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, fuzzy, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "Prikaz razvijanja"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, fuzzy, no-c-format
+msgid "No Indentation"
+msgstr "Bez uvlačenja"
 
-#: dialogs/diagramprintpage.cpp:135
-#, fuzzy
-msgid "No diagrams selected."
-msgstr "Nema odabranih dijagrama."
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Mogućnosti prikaza"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Razmak"
 
-#: dialogs/classpropdlg.cpp:179
-#, fuzzy
-msgid "Attribute Settings"
-msgstr "Postavke atributa"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, fuzzy, no-c-format
+msgid "Comment Verbosity"
+msgstr "Opširnost komentara"
 
-#: dialogs/classpropdlg.cpp:187
-#, fuzzy
-msgid "Operation Settings"
-msgstr "Postavke operacija"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, fuzzy, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Piši komentare &za odeljke iako je odeljak\n"
+"prazan"
 
-#: dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates Settings"
-msgstr "Postavke predložak"
+#: dialogs/codegenerationoptionsbase.ui:436
+#, fuzzy, no-c-format
+msgid ""
+"Writes comments to indicate the different sections (public, private etc) in "
+"a class, even if the sections are empty"
+msgstr ""
+"Piše komentare za naznaku drugog odeljka (javni, privatni itd.) u klasi, čak "
+"i ako su odeljci prazni"
 
-#: dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals Settings"
-msgstr "Postavke literala nabrajanja"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, fuzzy, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Piši dokumentaciju komentara čak iako su prazni"
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Postavke atributa"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, fuzzy, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Piši komentare &za dokumentaciju klase i metoda čak iako su prazni"
 
-#: dialogs/classpropdlg.cpp:216
-#, fuzzy
-msgid "Contents Settings"
-msgstr "Postavke sadržaja"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, fuzzy, no-c-format
+msgid "Language Options"
+msgstr "Opcije jezika"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Associations"
-msgstr "Pridruženja"
+#: dialogs/codegenerationwizardbase.ui:16
+#, fuzzy, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Čarobnjak za generiranje kôda"
 
-#: dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Class Associations"
-msgstr "Pridruženja klasa"
+#: dialogs/codegenerationwizardbase.ui:23
+#, fuzzy, no-c-format
+msgid "Select Classes"
+msgstr "Odaberite klase"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Postupci"
+#: dialogs/codegenerationwizardbase.ui:40
+#, fuzzy, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"U popis desno smijestite sve klase za\n"
+"koje želite da se generiše kôd"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Vidljivost"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Dodaj klasu za izradu koda"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr "Potpis o&peracije"
+#: dialogs/codegenerationwizardbase.ui:101
+#, fuzzy, no-c-format
+msgid "Classes Selected"
+msgstr "Odabrane klase"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Paket"
+#: dialogs/codegenerationwizardbase.ui:136
+#, fuzzy, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Ukloni klasu iz generiranja kôda"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&Atributi"
+#: dialogs/codegenerationwizardbase.ui:159
+#, fuzzy, no-c-format
+msgid "Classes Available"
+msgstr "Dostupne klase"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Stereotip"
+#: dialogs/codegenerationwizardbase.ui:209
+#, fuzzy, no-c-format
+msgid "Code Generation Status"
+msgstr "Status generiranja kôda"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-#, fuzzy
-msgid "Attr&ibute signature"
-msgstr "Potpis atr&ibuta"
+#: dialogs/codegenerationwizardbase.ui:226
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Pritisnite gumb za generiranje za početak generiranja kôda"
 
-#: dialogs/classoptionspage.cpp:108
-#, fuzzy
-msgid "Draw as circle"
-msgstr "Crtaj kao krug"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, fuzzy, no-c-format
+msgid "Generation Status"
+msgstr "Status generiranja"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "Initial state"
-msgstr "Početno stanje"
+#: dialogs/codeviewerdialogbase.ui:43
+#, fuzzy, no-c-format
+msgid "Show hidden blocks"
+msgstr "Pokaži skrivene blokove"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "End state"
-msgstr "Završno stanje"
+#: dialogs/codeviewerdialogbase.ui:59
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">ovdje ide ime komponente</p>"
 
-#: dialogs/statedialog.cpp:96
-#, fuzzy
-msgid "State type:"
-msgstr "Vrsta stanja:"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/statedialog.cpp:101
-#, fuzzy
-msgid "State name:"
-msgstr "Ime stanja:"
+#: dialogs/codeviewerdialogbase.ui:86
+#, fuzzy, no-c-format
+msgid "Show block type"
+msgstr "Pokaži vrstu bloka"
 
-#: dialogs/statedialog.cpp:130
-#, fuzzy
-msgid "Widget Color"
-msgstr "Boja kontrole"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Boje"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-#, fuzzy
-msgid "new_class"
-msgstr "nova_klasa"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Pismo:"
 
-#: dialogs/classwizard.cpp:54
-#, fuzzy
-msgid "New Class"
-msgstr "Nova klasa"
+#: dialogs/codevieweroptionsbase.ui:103
+#, fuzzy, no-c-format
+msgid "Paper:"
+msgstr "Papir:"
 
-#: dialogs/classwizard.cpp:59
-#, fuzzy
-msgid "Class Attributes"
-msgstr "Atributi klase"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Označeno"
 
-#: dialogs/classwizard.cpp:63
-#, fuzzy
-msgid "Class Operations"
-msgstr "Operacije klase"
+#: dialogs/codevieweroptionsbase.ui:260
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML blok objekta:</p>"
 
-#: dialogs/parmpropdlg.cpp:35
-#, fuzzy
-msgid "Parameter Properties"
-msgstr "Svojstva parametra"
+#: dialogs/codevieweroptionsbase.ui:276
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skriveni blok:</p>"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:294
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Neizmjenljiv tekst:</p>"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:333
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Urediv tekst:</p>"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "N&ačin"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Svojstva dijagrama"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Završetak"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zumiraj:"
 
-#: dialogs/codegenerationwizard.cpp:132
-#, fuzzy
-msgid "Code Generated"
-msgstr "Kôd je generiran"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:134
-#, fuzzy
-msgid "Not Generated"
-msgstr "Nije generiran"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Prikaži rešetku"
 
-#: dialogs/codegenerationwizard.cpp:141
-#, fuzzy
-msgid "Not Yet Generated"
-msgstr "Još uvijek nije generiran"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Prijanjaj uz mrežu"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/diagrampropertiespage.ui:202
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "Veličina komponente uklapanja"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, fuzzy, 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 ""
-"Odabrani datoteka %1 postoji.\n"
-"Želite li da ga prebrišete?"
+"Postavlja veličinu komponente tako da ona bude umnožak razmaka u mreži.\n"
+"Ako je uključena opcija „uklapaj uz mrežu“ komponenta će uvijek biti "
+"poravnata sa mrežom na sve četiri strane."
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Ne mogu napraviti direktorij"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "Ne&moj da praviš datoteka"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: 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."
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Ne mogu napraviti direktorij"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Izvezi kao sliku..."
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 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/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Vrsta stanja:"
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 se čini da nije direktorij. Molim, odaberite ispravan direktorij."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "mapa"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:27
-#, fuzzy
-msgid "Destination File Already Exists"
-msgstr "Odredišni datoteka već postoji"
-
-#: dialogs/overwritedialogue.cpp:31
-#, fuzzy
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
+"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 ""
-"Datoteka %1 već postoji u %2.\n"
-"\n"
-"Umbrello može da prebriše datoteka, napravi datoteka\n"
-"sosobnog imena ili da ga uopše i ne napravi."
-
-#: dialogs/overwritedialogue.cpp:34
-#, fuzzy
-msgid "&Apply to all remaining files"
-msgstr "&Priizbornik na sve preostale datotekaove"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Pr&epiši"
-
-#: dialogs/overwritedialogue.cpp:39
-#, fuzzy
-msgid "&Generate Similar File Name"
-msgstr "&Napravi sosobno ime datotekaa"
-
-#: dialogs/overwritedialogue.cpp:40
-#, fuzzy
-msgid "&Do Not Generate File"
-msgstr "Ne&moj da praviš datoteka"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-#, fuzzy
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
-
-#: associationwidget.cpp:2328
-#, fuzzy
-msgid "Multiplicity"
-msgstr "Višestrukost"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-#, fuzzy
-msgid "Enter multiplicity:"
-msgstr "Unesite višestrukost:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, fuzzy, no-c-format
+msgid "Role Changeability"
+msgstr "Izmjenljivost uloge"
 
-#: associationwidget.cpp:2346
-#, fuzzy
-msgid "Association Name"
-msgstr "Ime pridruživanja"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, fuzzy, no-c-format
+msgid "Role Visibility"
+msgstr "Vidljivost uloge"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-#, fuzzy
-msgid "Enter association name:"
-msgstr "Unesite ime pridruživanja:"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: associationwidget.cpp:2366
-#, fuzzy
-msgid "Role Name"
-msgstr "Ime uloge"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Unesite ime uloge:"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Grafikon"
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "Unesite ime pridruživanja:"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Novi"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Unesite novi tekst:"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Pokaži"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "GREŠKA"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zumiraj:"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Promijeni kut"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kod"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr ""
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktivni &jezik"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
+#: 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 ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: 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 ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: 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 ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: 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 ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: tips:30
+#, fuzzy
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 msgstr ""
+"<p>Ako želite u dijagram dodati klasu koja već postoji, samo prevucite njen "
+"unos iz stablolikog prikaza.</p>\n"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: 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 ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: tips:44
+#, fuzzy
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as "
+"actors.  Double click one for\n"
+"the Properties dialogue.</p>\n"
 msgstr ""
+"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
+"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
 
-#: aligntoolbar.cpp:383
+#: tips:51
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:57
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+#: 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 ""
 
-#: umlviewimageexporter.cpp:46
+#: tips:71
 #, fuzzy
-msgid "Exporting view..."
-msgstr "Izlazim..."
-
-#: umlviewimageexporter.cpp:50
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
 msgstr ""
+"<p>Izreži i kopiraj će također izvesti sliku u PNG klipbord, odakle može "
+"biti umetnuta u KWord i druge programe.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:78
+#, fuzzy
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
 msgstr ""
-"Odabrana datoteka %1 postoji.\n"
-"Želite je prepisati?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Datoteka već postoji"
-
-#: model_utils.cpp:244
-#, fuzzy
-msgid "new_actor"
-msgstr "novi_akter"
-
-#: model_utils.cpp:246
-#, fuzzy
-msgid "new_usecase"
-msgstr "novo_korištenje_slučaja"
-
-#: model_utils.cpp:248
-#, fuzzy
-msgid "new_package"
-msgstr "novi_paket"
-
-#: model_utils.cpp:250
-#, fuzzy
-msgid "new_component"
-msgstr "nova_komponenta"
-
-#: model_utils.cpp:252
-#, fuzzy
-msgid "new_node"
-msgstr "novi_čvor"
-
-#: model_utils.cpp:254
-#, fuzzy
-msgid "new_artifact"
-msgstr "novi_artifakt"
-
-#: model_utils.cpp:256
-#, fuzzy
-msgid "new_interface"
-msgstr "novi_interfejs"
-
-#: model_utils.cpp:258
-#, fuzzy
-msgid "new_datatype"
-msgstr "nova_vrsta_podataka"
-
-#: model_utils.cpp:260
-#, fuzzy
-msgid "new_enum"
-msgstr "novo_nabrajanje"
-
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "novo_nabrajanje"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "novi_čvor"
+"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
+"napraviti pomerljivu tačku.</p>\n"
 
-#: model_utils.cpp:268
+#: tips:84
 #, fuzzy
-msgid "new_object"
-msgstr "novi_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
+"<p>Automatsko spremanje možete uključiti u dijalogu za podešavanje Umbrello-"
+"a.</p>\n"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr ""
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: 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 ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: tips:101
+#, fuzzy
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 msgstr ""
+"<p>Sve odabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: tips:107
+#, fuzzy
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
 msgstr ""
+"<p>Ako ste našli grešku u Umbrello-u, molimo vas da nas obavestite.\n"
+"Greške možete poslani alatom za prijavu grešaka iz izbornika Pomoć.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: tips:114
+#, fuzzy
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
 msgstr ""
+"<p>Pritiskom na tipka Escape postavlja se trenutni alat na odabrani alat.\n"
+"Backspace-om se skače na prethodno korišteni alat.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Dodajte osnovnu klasu"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Dodaj izvedenu klasu"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Postupak"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Atributi"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Dodaj osnovnu sučelje"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Dodaj izvedeno sučelje"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
+#: tips:121
 #, fuzzy
-msgid "Base Classifiers"
-msgstr "Bazni klasifikatori"
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Možete odabrati sve objekte pritiskom na Ctrl-A.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
+#: tips:127
 #, fuzzy
-msgid "Derived Classifiers"
-msgstr "Izvedeni klasifikatori"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Ne mogu napraviti direktorij"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Nije moguće snimiti prazan dijagram"
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
 msgstr ""
+"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz izbornika "
+"Kôd.</p>\n"
 
 #, fuzzy
 #~ msgid "new_stereotype"
@@ -4406,7 +4506,8 @@ msgstr ""
 #~ msgstr "Pravi pridruživanja odnosa između UML elemenata"
 
 #, fuzzy
-#~ msgid "Creates unidirectional association relationships between UML elements"
+#~ msgid ""
+#~ "Creates unidirectional association relationships between UML elements"
 #~ msgstr "Pravi jednosmerna pridruživanja odnosa između UML elemenata"
 
 #, fuzzy
@@ -4453,9 +4554,13 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "<p>Many new code generators have been added in this release.  You can now generate code for\n"
+#~ "<p>Many new code generators have been added in this release.  You can now "
+#~ "generate code for\n"
 #~ "JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, IDL and Ada.</p>\n"
-#~ msgstr "<p>Mnogi novi generatori kôda su dodati u ovom izdanju. Sada možete generisati kôd za JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, IDL i Ada.</p>\n"
+#~ msgstr ""
+#~ "<p>Mnogi novi generatori kôda su dodati u ovom izdanju. Sada možete "
+#~ "generisati kôd za JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, "
+#~ "IDL i Ada.</p>\n"
 
 #, fuzzy
 #~ msgid "UML Diagrams"
diff --git a/tde-i18n-hu/messages/tdesdk/umbrello.po b/tde-i18n-hu/messages/tdesdk/umbrello.po
index 65b8870187c..74397903332 100644
--- a/tde-i18n-hu/messages/tdesdk/umbrello.po
+++ b/tde-i18n-hu/messages/tdesdk/umbrello.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-09-25 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -12,248 +12,209 @@ 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 "Az Umbrello UML modellező autonóm kódgenerátora"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Az átalakítandó fájl"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "A használni kívánt XSLT-fájl"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) Gael de Chalendar (aka Kleag), 2006., (c) Az Umbrello UML modellező "
-"szerzői, 2002-2006."
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Az Umbrello UML modellező szerzői"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Szántó Tamás"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Az összes nézet exportálása..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tszanto@mol.hu"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Hiba történt a képek exportálása közben:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "A tevékenység neve"
 
-#: 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 "Hiba történt a(z) %1 fájl mentése közben"
+#: 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 "Adja meg az új tevékenység nevét:"
 
-#: 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 "Mentési hiba"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Balra igazítás"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objektum"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Jobbra igazítás"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Szinkron üzenet"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Felülre igazítás"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Aszinkron üzenet"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alulra igazítás"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Társítás"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Függőlegesen középre igazítás"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Tartalmazás"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Vízszintesen középre igazítás"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Horgony"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Függőlegesen elosztás"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Címke"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Vízszintesen elosztás"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Megjegyzés"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Igazításhoz legalább két objektumot (pl. osztályt, szereplőt) kell "
+"kiválasztani. Társításokat nem lehet igazítani."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Doboz"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formázás"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Szereplő"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Függőség"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Általánosítás"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregáció"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Viszony"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Egyirányú társítás"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Megvalósítás (általánosítás/realizáció)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Összetétel"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Eset"
-
-#. 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 "Osztály"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Kezdeti állapot"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Végállapot"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Elágazás/összeolvasztás"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Szétválasztás/egyesítés"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Csomag"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponens"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Csomópont"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Függőség"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Tárgy"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Társítás"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Felület"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Társítás saját magával"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Adattípus"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Csoportmunka-üzenet"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Felsorolt"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sorozat-üzenet"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entitás"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Csoportmunka-üzenet saját magának"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Napló (mély)"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sorozat-üzenet saját magának"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Napló (nem mély)"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Tartalmazás"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Egyesítés"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Összetétel"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Elágaztatás"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Megvalósítás"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Csomópont"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni társítás"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Választás"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Horgony"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Állapotátmenet"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Tevékenységváltozás"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Tevékenység"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Állapot"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicitás"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Végső tevékenység"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Adja meg a multiplicitást:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Kezdeti tevékenység"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "A társítás neve"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Üzenet"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Adja meg a társítás nevét:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "NEM DEFINIÁLT"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "A szerep neve"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Kiválasztás"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Adja meg a szerep nevét:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Már létezik művelet ezzel a névvel és aláírással. Nem lehet még egyszer "
+"felvenni."
+
+#: 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 "A megadott név érvénytelen."
+
+#: 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 "Érvénytelen név"
+
+#: 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 "Ez a név már foglalt."
+
+#: 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 "A név nem egyedi"
 
 #: 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."
+"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 ""
-"A vágólapon található objektumok közül legalább egy beillesztése nem sikerült, "
-"mert olyan nevű elem már létezik. A többi elem beillesztése megtörtént."
+"A vágólapon található objektumok közül legalább egy beillesztése nem "
+"sikerült, mert olyan nevű elem már létezik. A többi elem beillesztése "
+"megtörtént."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -264,18 +225,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"A(z) %1 fájl nem nyitható meg írásra. Ellenőrizze, hogy a könyvtár létezik-e és "
-"van-e benne írási jogosultsága."
+"A(z) %1 fájl nem nyitható meg írásra. Ellenőrizze, hogy a könyvtár létezik-e "
+"és van-e benne írási jogosultsága."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "A fájl megnyitása nem sikerült"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Az alábbi könyvtárt nem sikerült létrehozni:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Az alábbi könyvtárt nem sikerült létrehozni:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -289,1356 +248,1523 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "A könyvtárt nem sikerült létrehozni"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Adja meg az állapot nevét"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Általános beállítások"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Adja meg az új állapot nevét:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "A csomag névtér legyen"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Tevékenység megadása"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuális destruktorok"
 
-#: 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 "Adja meg az új tevékenység nevét:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Üres konstruktorok generálása"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "új tevékenység"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Hozzáférési tagfüggvények (accessor) generálása"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-modell"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "A műveletek közvetlenek (inline) legyenek"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logikai nézet"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "A hozzáférési tagfüggvények közvetlenek (inline) legyenek"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Eseti nézet használata"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "A hozzáférési tagfüggvények publikusak legyenek"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponens-nézet"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Fájl importálása: %1 - %2/%3 kész"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Elhelyezési nézet"
+#: 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 "Kész."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entitásviszony-modell"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "A(z) %1 scope névtér vagy osztály?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Adattípusok"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "A C++-importálás beavatkozást igényel"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Az aktuális fájl tartalma megváltozott.\n"
-"El szeretné menteni?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Névtér"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "%1 nevű fájl nem létezik."
+#: 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 "Osztály"
 
-#: 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 "Betöltési hiba"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Belső hiba"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "A(z) %1 fájl valószínűleg hibás."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Szintaktikai hiba ezelőtt: '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Nem található XMI-fájl a(z) %1 tömörített fájlban."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Feldolgozási hiba ezelőtt: '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Hiba történt a(z) %1 kitömörített fájl betöltésekor."
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Hiba történt a(z) %1 fájl betöltésekor."
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "kifejezésnek kellett volna következnie"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Hiba történt a(z) %1 fájl feltöltése közben"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Szintaktikai hiba a deklarációban"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "eseti diagram használata"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} jelnek kellett volna következnie"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "osztálydiagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "névtérnek kellett volna következnie"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sorozatdiagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ jelnek kellett volna következnie"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "csoportmunka-diagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Névtérnévnek kellett volna következnie"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "állapotdiagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Deklarációhoz típusmeghatározás szükséges"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "tevékenységi diagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "deklarációnak kellett volna következnie"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponensdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Konstans kifejezésnek kellett volna következnie"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "elhelyezési diagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' jelnek kellett volna következnie"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "entitásviszony-diagram"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} jelnek kellett volna következnie"
 
-#: 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 "Név"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Taginicializálónak kellett volna következnie"
 
-#: 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 "Név:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Alaposztály-meghatározásnak kellett volna következnie"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "A diagramnak adott név érvénytelen."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Inicializálási kifejezésnek kellett volna következnie"
 
-#: 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 "Érvénytelen név"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Azonosítónak kellett volna következnie"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Egy másik diagram már használja ezt a nevet."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Típusazonosítónak kellett volna következnie"
 
-#: 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 "A név nem egyedi"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Osztálynévnek kellett volna következnie"
 
-#: 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 "A megadott név érvénytelen."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "feltételnek kellett volna következnie"
 
-#: 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 "Ez a név már foglalt."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "állításnak kellett volna következnie"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"A megadott név nem egyedi.\n"
-"Biztosan ezt szerette volna?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for inicializációnak kellett volna következnie"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nem egyedi diagram"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch utasításnak kellett volna következnie"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "A név használata"
+#: 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 "&Tulajdonságok"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Adja meg az új nevet"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Kezdeti tevékenység"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Biztosan törölni szeretné a(z) %1 diagramot?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Végső tevékenység"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "A diagram törlése"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Elágazás/összeolvasztás"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "A dokumentum beállítása..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Szétválasztás/egyesítés"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Az objektumhivatkozások feloldása..."
+#: 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 "Általános"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML-elemek betöltése..."
+#: 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 "Általános tulajdonságok"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Diagramok betöltése..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tevékenységtípus:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Tevékenységnév:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Dokumentáció"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Könyvtár külsővé tétele"
+#: 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 "Betűtípus:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Adja meg a modell nevét"
+#: 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 "Betűtípus-beállítások"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "A modell új neve:"
+#: 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 "Szín"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Nézetek"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "A grafikus elemek színei"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"A megadott név érvénytelen.\n"
-"A létrehozási folyamat megszakadt."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Tevékenységek"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Érvénytelen név"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Új tevékenység..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"A megadott név nem egyedi!\n"
-"A létrehozási folyamat megszakadt."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Szereplő törlése"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "A létrehozás meg lett szakítva"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Átnevezés"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Listanézet betöltése..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Új tevékenység"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Csak üres könyvtárat lehet törölni."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "új tevékenység"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "A könyvtár nem üres"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "A tevékenység átnevezése"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Már létezik művelet ezzel a névvel és aláírással. Nem lehet még egyszer "
-"felvenni."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "A tevékenység új neve:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "A tevékenység neve"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Név:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "új állapot"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Típus:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Általánosítás"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Társítások"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Társítás saját magával"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "A társítás tulajdonságai"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Csoportmunka-üzenet"
+#: 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 "Általános beállítások"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sorozat-üzenet"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Szerepek"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Csoportmunka-üzenet saját magának"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Szerepbeállítások"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sorozat-üzenet saját magának"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "A társítás betűtípusa"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Megvalósítás"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Az 'A' szerep tulajdonságai"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni társítás"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "A 'B' osztály tulajdonságai"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportálás"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Az 'A' szerep láthatósága"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "A 'B' szerep láthatósága"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "Ú&j"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Az 'A' szerep módosíthatósága"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Meg&jelenítés"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "A 'B' szerep módosíthatósága"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Programkód"
+msgid "Rolename:"
+msgstr "A szerep neve:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Ak&tív nyelv"
+msgid "Multiplicity:"
+msgstr "Multiplicitás:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentáció"
+msgid "Public"
+msgstr "Public"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Vonás, vonás (//)"
+msgid "Private"
+msgstr "Private"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Vonás, csillag (/**  */)"
+msgid "Protected"
+msgstr "Protected"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stílus:"
+msgid "Implementation"
+msgstr "Implementáció"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++-os kódgenerálás</p>"
+msgid "Changeable"
+msgstr "Módosítható"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Általános"
+msgid "Frozen"
+msgstr "Rögzített"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Tagfüggvény-megvalósítás generálása"
+msgid "Add only"
+msgstr "Csak hozzáadás"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Az alábbiakat kell használni a generált kód osztályaiban:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Az osztál&y neve:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "A szere&plő neve:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Csomagnév:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Változó</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "E&setnév használata:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "A csatl&akozási felület neve:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "A komp&onens neve:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "A tár&gy neve:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Sztring</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Felsorolt né&v:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Az adattípus ne&ve:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entitásné&v:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globális?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Sz&tereotípus-név:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Cso&magnév:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Az osztály neve"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bsztrakt osztály"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Include fájl</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bsztrakt használat"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projektgenerálás"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Végrehajtható"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "ANT fordítási dokumentum létrehozása"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Kirajzolás mint"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "A tagfüggvények automatikus létrehozása"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Alapértelmezés"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Üres konstruktorok"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Kitö&ltés:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Társításelérési tagfüggvények"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Köny&vtár"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Attribútumelérési tagfüggvények"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "Táb&lázat"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Láthatóság"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Private"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublic"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivát"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "A szülőobjektumból"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Alapértelmezett attribútumelérési hatókör:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "&Implementáció"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Alapértelmezett társítási mező-hatókör:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Az osztály neve:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "A szülőobjektum szerepéből"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "A példány neve:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java kódgenerálás</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Kirajzolás szereplőként"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Kereszt (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Több példány"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Begin-End (=begin =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "A felbontás megjelenítése"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby kódgenerálás</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "A komponens neve:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Csomópontnév:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Sztereotípus-név:"
+
+#: 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 ""
+"A választott nyelv már\n"
+"foglalt.\n"
+"A név visszaállt az alapértelmezésre."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "A név nem egyedi"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attribútumok"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Új attr&ibútum..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Műveletek"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Ú&j művelet..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Sablonok"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Ú&j sablon..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Felsorolt nevek"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Ú&j felsorolt név..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entitás-attribútumok"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Új entitás-attr&ibútum..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Szereplő törlése"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Tulajdonságok"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Megjelenítés"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Mű&veletek"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "Láth&atóság"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Műveletaláí&rás"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Csomag"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Attribút&umok"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Sztereotí&pus"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attribútuma&láírás"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Kirajzolás körként"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Megjelenítés"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Megjelenítési beállítások"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribútumbeállítások"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Műveleti beállítások"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "A sablonok beállításai"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "A felsorolt nevek beállításai"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Az entitás-attribútumok beállításai"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Tartalmazás"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "A tartalom beállításai"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Osztálytársítások"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "új_osztály"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Új osztály"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Osztályattribútumok"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Osztályműveletek"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Kódgenerálási opciók"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Nyelv"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generálás"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Könyvtárak"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Befejezés"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "A generált fájlok ebbe a könyvtárba kerüljenek:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "A kód generálása megtörtént"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Ta&llózás..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Nem történt kódgenerálás"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&Tallózás..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Még nem történt kódgenerálás"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Fejlécfájlok beillesztése ebből a könyvtárból:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Nem létezik %1 nevű könyvtár. Létre szeretné hozni most?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"A kódgenerátor által létrehozott fájlok ebbe a könyvtárba fognak kerülni"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "A kimeneti könyvtár nem létezik"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "A könyvtár létrehozása"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Nem kell létrehozni"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Az ebben a könyvtárban található fájlok fejlécfájlként fognak szerepelni a "
-"generált kódban"
+"A könyvtárt nem sikerült létrehozni.\n"
+"Ellenőrizze, hogy van-e írási jogosultsága a szülőkönyvtárban, vagy "
+"válasszon egy másik, érvényes könyvtárat."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Felülírási mód"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Hiba történt a könyvtár létrehozása közben"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Válasszon egy érvényes könyvtárat."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Ha a kódgenerátor új fájlt akar létrehozni,\n"
-"de a fájl már létezik:"
+"A kimeneti könyvtár létezik, de nem lehet bele írni.\n"
+"Állítsa be a szükséges jogosultságokat vagy válasszon egy másik könyvtárat."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Felülírás"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Nem sikerült írni a kimeneti könyvtárba"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "A már létező fájlok felülírása a célkönyvtárban"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 nem könyvtár, válasszon egy érvényes könyvtárat."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Rákér&dezés"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Válasszon egy érvényes könyvtárat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Ha egy adott nevű fájl már létezik, a program kérdezze meg a felhasználótól, mi "
-"a teendő"
+msgid "Code Viewer"
+msgstr "Kódnézegető"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Más né&v használata"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nincs módosítható beállítás.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Ha egy fájl már létezik a célkönyvtárban, válasszon egy másik nevet egy utótag "
-"megadásával"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramok"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formázás"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Szűrő"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Sorok"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "A &jelenlegi diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Sorvégződési stílus:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "A&z összes diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Behúzási típus:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "A kijelölt diagram&ok"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Behúzási távolság:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "A diagram tí&pusa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Kiválasztás"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Eset"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Csoportmunka"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Nincs behúzás"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sorozat"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulátor"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Állapot"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Szóköz"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponens"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "A megjegyzések részletessége"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Elhelyezés"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Nincs kiválasztva diagram."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "A képek exportálási formátuma"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Megjegyzések (dokumentáció)"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "A célként megadott fájl már létezik"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"A sza&kaszmegjegyzést akkor is létre kell\n"
-"hozni, ha a szakasz üres"
+"%1 nevű fájl már létezik itt: %2.\n"
+"\n"
+"A fájl felülírható, más néven új fájl hozható\n"
+"létre, vagy a fájl generálása kihagyható."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "Alk&almazás a többi fájlra is"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Felülírás"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Hasonló fájlnév generálása"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Nem ke&ll fájlt létrehozni"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "A paraméter tulajdonságai"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "Típ&us:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "Né&v:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Ke&zdeti érték:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Az irány átadása"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Megjegyzésekben jelzi, hogy a kód melyik szakasza van éppen (public, private "
-"stb.) egy osztályon belül, akkor is, ha a megjegyzés tartalma üres"
+"Az \"in\" csak olvasható, az \"out\" csak írható, az \"inout\" írható és "
+"olvasható paraméter."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "A megjegyzések létrehozása &akkor is, ha üresek"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "A tartalmazott elemek"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Az osztályok és tagfüggvények megj&egyzéseinek létrehozása akkor is, ha üresek"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Művelet kiválasztása"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Nyelvi beállítások"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sorozatszám:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Kódgenerálási varázsló"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Osztályművelet:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Osztályválasztás"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Egyéni művelet:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Az Umbrello beállításai"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Felhasználói felület"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "A felhasználói felület beállításai"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Vonalszín:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Alapé&rtelmezett szín"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Kitöltési szín:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Az alapértelme&zett szín"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Vonalvastagság:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Az a&lapértelmezett vastagság"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "A &kitöltési szín használata"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Helyezze az összes olyan osztályt a jobb oldali listába,\n"
-"amelyhez kódot szeretne generáltatni"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Osztály hozzáadása kódgeneráláshoz"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "A visszavonási lehetőség bekapcsolása"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "A kijelölt osztályok"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Lapozós diagramok használata"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Osztály eltávolítása a kódgenerálásból"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Új C++/Java/Ruby-generátorok használata"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "A rednelkezésre álló osztályok"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Ferde társítási vonalak használata"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Kódgenerálási állapot"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatikus mentés"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Nyomja meg a Generálás gombot a kódgenerálás elkezdéséhez"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Az automatikus mentés bekapcs&olása"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Kódgenerálási állapot"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Az automatikus mentés időköze (min):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kódnézegető"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Az automatikus mentés utótagjának beállítása:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "A rejtett blokkok megjelenítése"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Az automatikus mentés során a fájl  ~/autosave.xmi néven lesz "
+"elmentve, ha a fájl még egyszer sem volt kézzel elmentve.</p><p>Ha már "
+"legalább egyszer el lett mentve, akkor az automatikusan mentett változat a "
+"fájl könyvtárába kerül, és az itt megadott kiterjesztés lesz hozzáfűzve a "
+"fájlnévhez.</p><p>Ha a kiterjesztés megegyezik a fájlnév kiterjesztésével, "
+"akkor az automatikus mentés az eredeti fájlt fogja felülírni.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">ide jön a komponens neve</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Indulás"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "A blokktípus megjelenítése"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Indítási kép"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Színek"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "Mai ti&pp"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Betűtípus:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Az utolsó pr&ojekt betöltése"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papír:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Új projekt kezdése:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "A kijelölés:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Nincs diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML objektumblokk:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Osztálydiagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Rejtett blokk:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Esetdiagram használata"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Nem szerkeszthető szöveg:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sorozatdiagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Szerkeszthető szöveg:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Csoportmunka-diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "A diagram tulajdonságai"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Állapotdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Név:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Tevékenységdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Nagyítás:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponensdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Elhelyezési diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Osztálybeállítások"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "A lát&hatóság megjelenítése"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Az attribútumok megjelenítése"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "A műveletek megjelenítése"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "A szt&ereotípus megjelenítése"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Az attribútumaláírás megjelenítése"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "A csomag megjelenítése"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "A műveleti aláírás megjelenítése"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "A rá&cs megjelenítése"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Kezdeti hatókör"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Illesztés a &rácshoz"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Alapértelmezett attribútum-hatókör:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Az illesztési rács mérete"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "A művelet alapértelmezett hatóköre:"
 
-#. 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."
-msgstr ""
-"A komponensek mérete mindig a rácsméret egész számszorosa legyen.\n"
-"Ha az 'Illesztés a rácshoz' opció be van jelölve, a komponens mind a négy "
-"oldala a rácshoz fog illeszkedni."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kódgenerálás"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Rácstávolság:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Kódgenerálási beállítások"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "A kódnézegető beállításai"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Kezdeti állapot"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Vonalvastagság:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Végállapot"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Az összes nézet exportálása"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Az állapot típusa:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "A diagramok ebbe a &könyvtárba kerüljenek:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Az állapot neve:"
 
-#. 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"
-msgstr "A képek mentéséhez használt alapkönyvtár:"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "A grafikus elemek színe"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Ké&ptípus:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribútumjellemzők"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "A képek exportálási formátuma"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Érvényességi kö&r (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Könyv&tárak használata"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Publikus"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"A célkönyvtárban jöjjön létre a fastruktúra, amelyben elrendezve\n"
-"a nézetek a dokumentumban szerepeltek"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Véde&tt"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "&Implementáció"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Érvénytelen attribútumnevet adott meg."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Érvénytelen attribútumnév"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"A nézetek a dokumentum mappáiban vannak elhelyezve. A nézetek tárolására "
-"szolgáló fastruktúra megőrizhető a célkönyvtárban, ha bejelöli ezt az opciót.\n"
-"Csak a felhasználó által létrehozott mappák jönnek létre az alapkönyvtárban "
-"(logikai nézet, esetnézet stb. nem jön létre)."
+"Az attribútum nevének megadott név már le van foglalva ebben a műveletben."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "A szerep tulajdonságai"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Az attribútum neve nem egyedi"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "A szerep neve:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Az entitásattribútum jellemzői"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicitás:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Alapértelmezés:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "A szerep módosíthatósága"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Hossz/értékek:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Csak hozzáadás"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "A&utomatikus növelés"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Rögzített"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "A Null en&gedélyezése"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Módosítható"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attribútumok:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "A szerep láthatósága"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexelés"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementáció"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "N&incs"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Üdvözöljük az Umbrellóban!</p>\n"
-"<p>Az UML-diagramok objektumalapú szoftver tervezését és dokumentálását "
-"segítik.  <a href=\"help:/umbrello\">Az Umbrello kézikönyvben</a> "
-"bevezető szintű ismertető található az UML-ről.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Elsődleges"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Üdvözöljük az Umbrello 1.5-ben! Néhány új lehetőség ebben a verzióban: "
-"társítási osztályok, Ruby-alapú kódgenerálás, külsővé tehető könyvtárak, "
-"felületek átalakítása osztályokká.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>A lapozós diagramok és a külsővé tett könyvtárak használata kizárja egymást. "
-"Ha külső könyvtárakat szeretne használni, akkor az Általános lapon kapcsolja ki "
-"a &quot;Lapozós diagramok használata&quot; opciót.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "Eg&yedi"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>A diagram legtöbb eleme nem méretezhető át, hanem automatikusan állapítják "
-"meg a méretet, a tartalom alapján.\n"
-"A dobozok, megjegyzések és sorozatdiagram-üzenetek átméretezhetők a piros "
-"négyzetre kattintva, húzással.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Érvénytelen entitásattribútum-nevet adott meg."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Ha egy már létező osztályt szeretne hozzáadni a diagramhoz, húzza át annak "
-"bejegyzését a fastruktúrából.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Érvénytelen entitásattribútum-név"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Az Umbrello átfaktorizálási szolgáltatása lehetővé teszi műveletek "
-"mozgatását egy osztály és annak szülő- ill. származtatott osztályai\n"
-"között.\n"
-"Kattintson egy osztályra a jobb gombbal az átfaktorizálási ablak "
-"előhívásához.</p>\n"
+"Az entitásattribútum nevének megadott név már le van foglalva ebben a "
+"műveletben."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Sorozatdiagram-objektumhoz tartozhat destruktordoboz és szereplőként is "
-"megjelenhet. Kattintson duplán az egyikre\n"
-"a Tulajdonságok ablak előhívásához.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Az entitásattribútum neve nem egyedi"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>A sorozatdiagram-üzenetek konstruktorként is használhatók. Kattintson az "
-"objektumdobozra (a függőleges vonal helyett), ha konstruktorrá szeretné "
-"változtatni.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "A művelet tulajdonságai"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>A sorozatdiagramok saját maguknak is küldhetnek üzenetet. Kattintson újból "
-"ugyanarra a függőleges vonalra saját magának történő üzenet készítéséhez.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Ab&sztrakt művelet"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Ha külső fájl betöltésekor semmi sem jelenik meg a listanézetben, próbálja "
-"elmenteni a modellt más néven,\n"
-"zárja be, majd töltse be újból a fájlt. Ilyenkor általában megjavul a "
-"listanézet.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Lekérdezés (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>A Másolás/Kivágás művelettel az ábra PNG képként a vágólapra helyezhető, "
-"ahonnan beilleszthető\n"
-"a KWordbe vagy egy másik alkalmazásba.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Paraméterek"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>A társításoknak nem kell feltétlenül egy vonalra esniük, dupla kattintással "
-"mozgatható pont nyitható rajtuk.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Ú&j paraméter..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>A beállítóablakban be lehet kapcsolni az automatikus mentést.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Érvénytelen nevet adott egy paraméternek."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Kérjük jelezze, hogy milyen funkciókat hiányol a programban.\n"
-"A Segítség menü Hibabejelentés menüpontjával vagy közvetlenül az uml-devel\n"
-"fejlesztői listára küldve jelezheti kívánságait, javaslatait.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Érvénytelen paraméternév"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>A kijelölt objektumok törléséhez nyomja meg a Del vagy Backspace "
-"billentyűt.</p>\n"
+"A paraméter nevének választott név\n"
+"már le van foglalva ebben a műveletben."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Kérjük, hogy a programban talált hibákról értesítsen minket. \n"
-"A Segítség menü Hibabejelentés menüpontjával ez könnyen megtehető.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "A paraméter neve nem egyedi"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Az Esc lenyomásakor a kijelölt eszköz lesz az aktuális.\n"
-"A Backspace-szel az előzőleg használt eszközre lehet váltani.</p>\n"
+"A paraméter nevének megadott név már le van foglalva ebben a műveletben."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Érvénytelen műveletnevet adott meg."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "A művelet neve nem egyedi"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Már létezik művelet ezzel az aláírással itt: %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Válasszon más nevet vagy paraméterlistát."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "A szerep tulajdonságai"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "A sablon tulajdonságai"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Érvénytelen sablonnevet adott meg."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "A sablon neve érvénytelen"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>A Ctrl+A lenyomásával lehet az összes diagramot kiválasztani.</p>\n"
+"A sablonparaméter nevének megadott név már le van foglalva ebben a "
+"műveletben."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "A sablonnév nem egyedi"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Osztálymegjelenítési jellemzők"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "A diagram színei"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "A megadott név érvénytelen."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "A megadott név nem egyedi."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nem egyedi diagram"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Vonal:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Kitö&ltés:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "A&lapértelmezés"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "K&itöltés használata"
 
-#: tips.txt:108
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Az összes nézet exportálása..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Hiba történt a képek exportálása közben:"
+
+#: 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 "Hiba történt a(z) %1 fájl mentése közben"
+
+#: 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 "Mentési hiba"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Az Umbrello UML modellező autonóm kódgenerátora"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Az átalakítandó fájl"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "A használni kívánt XSLT-fájl"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Új osztály létrehozásához, tulajdonságainak beállításához használja az "
-"Osztálylétrehozási varázslót a Programkód menüben.</p>\n"
+"(c) Gael de Chalendar (aka Kleag), 2006., (c) Az Umbrello UML modellező "
+"szerzői, 2002-2006."
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Az Umbrello UML modellező szerzői"
+
+#: 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 "Név"
+
+#: 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 "Név:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Adja meg a művelet nevét:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Adja meg az új szöveget:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "HIBA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "A szöveg megváltoztatása"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "%1 nevű fájl nem létezik."
+
+#: 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 "Betöltési hiba"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "A(z) %1 fájl nem nyitható meg."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1692,6 +1818,10 @@ msgstr "Új művelet..."
 msgid "Select Operation..."
 msgstr "Művelet kiválasztása..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "A szöveg megváltoztatása..."
@@ -1743,6 +1873,19 @@ msgstr "Új"
 msgid "Rename..."
 msgstr "Átnevezés..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Beillesztési hiba"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Vonalszín..."
@@ -1771,14 +1914,26 @@ msgstr "Könyvtár belsővé tétele"
 msgid "Import Classes..."
 msgstr "Osztályok importálása..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Csomag"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Alrendszer"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Tárgy"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponensdiagram..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Csomópont"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Elhelyezési diagram..."
@@ -1787,10 +1942,18 @@ msgstr "Elhelyezési diagram..."
 msgid "Folder"
 msgstr "Mappa"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entitás"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Entitásviszony-diagram..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Szereplő"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Esetdiagram használata..."
@@ -1827,6 +1990,18 @@ msgstr "Új entitásattribútum..."
 msgid "Export as Picture..."
 msgstr "Exportálás képként..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Felület"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Adattípus"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Felsorolt"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Osztálydiagram..."
@@ -1847,26 +2022,10 @@ msgstr "Sorozatdiagram..."
 msgid "Collaboration Diagram..."
 msgstr "Csoportmunka-diagram..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attribútumok"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Műveletek"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Csak publikus"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Láthatóság"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Műveletaláírás"
@@ -1879,11 +2038,6 @@ msgstr "Attribútumaláírás"
 msgid "Stereotype"
 msgstr "Sztereotípus"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Megjelenítés"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribútum..."
@@ -1908,14 +2062,6 @@ msgstr "Kitöltési szín..."
 msgid "Use Fill Color"
 msgstr "A kitöltési szín használata"
 
-#: 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 "Szín"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Szereplő..."
@@ -1944,10 +2090,26 @@ msgstr "Felsorolás..."
 msgid "Package..."
 msgstr "Csomag..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Kezdeti állapot"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Végállapot"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Állapot..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Kezdeti tevékenység"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Végső tevékenység"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Alrendszer..."
@@ -1992,6 +2154,14 @@ msgstr "Szereplő törlése"
 msgid "Change Association Name..."
 msgstr "A társítás nevének megváltoztatása..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "A diagram törlése"
@@ -2026,8 +2196,8 @@ msgstr "a fájl könyvtára"
 
 #: 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 "a nézetek eredeti fastruktúrájának megőrzése a célkönyvtárban"
 
 #: main.cpp:95
@@ -2035,191 +2205,94 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) Paul Hensgen, 2001., (c) Az Umbrello UML modellező szerzői, 2002-2006."
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Nem megfelelő módon van használva egy társítás."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Társítási hiba"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "%1 nevű fájl nem létezik."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "A(z) %1 fájl nem nyitható meg."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Szántó Tamás"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tszanto@mol.hu"
-
-#: 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 "Kész."
-
-#: 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 ""
-"A Shift vagy a Ctrl lenyomva tartásával lehet X irányba mozgatni. A Shift és a "
-"Ctrl lenyomva tartásával lehet Y irányba mozgatni. A mozgatást a jobb "
-"egérgombbal történő kattintással lehet megszakítani."
-
-#: 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 ""
-"A Shift vagy a Ctrl lenyomva tartásával lehet X irányba mozgatni. A Shift és a "
-"Ctrl lenyomva tartásával lehet Y irányba mozgatni. Az átméretezést a jobb "
-"egérgombbal történő kattintással lehet megszakítani."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "A(z) %1 scope névtér vagy osztály?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "A C++-importálás beavatkozást igényel"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Névtér"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Fájl importálása: %1 - %2/%3 kész"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Belső hiba"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Szintaktikai hiba ezelőtt: '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Feldolgozási hiba ezelőtt: '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "új_szereplő"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "kifejezésnek kellett volna következnie"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "új_felhasználás"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Szintaktikai hiba a deklarációban"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "új_csomag"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} jelnek kellett volna következnie"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "új_komponens"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "névtérnek kellett volna következnie"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "új_csomópont"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ jelnek kellett volna következnie"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "új_tárgy"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Névtérnévnek kellett volna következnie"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "új_felület"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Deklarációhoz típusmeghatározás szükséges"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "új_adattípus"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "deklarációnak kellett volna következnie"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "új_felsorolt"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Konstans kifejezésnek kellett volna következnie"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "új_entitás"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' jelnek kellett volna következnie"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "új_könyvtár"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} jelnek kellett volna következnie"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "új_társítás"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Taginicializálónak kellett volna következnie"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "új_objektum"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Alaposztály-meghatározásnak kellett volna következnie"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Inicializálási kifejezésnek kellett volna következnie"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Üres"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Azonosítónak kellett volna következnie"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Hibás formátumú argumentum"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Típusazonosítónak kellett volna következnie"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Ismeretlen argumentumtípus"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Osztálynévnek kellett volna következnie"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nem megengedett eljárásnév"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "feltételnek kellett volna következnie"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Ismeretlen visszaadási típus"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "állításnak kellett volna következnie"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Ismeretlen hiba"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for inicializációnak kellett volna következnie"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Ez egy foglalt kulcsszó a kódgenerálhoz választott nyelvben."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch utasításnak kellett volna következnie"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Foglalt kulcsszó"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2233,105 +2306,66 @@ msgstr "Az objektum neve:"
 msgid "new_parameter"
 msgstr "új_paraméter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Általános beállítások"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "A csomag névtér legyen"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuális destruktorok"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Üres konstruktorok generálása"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Hozzáférési tagfüggvények (accessor) generálása"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "A műveletek közvetlenek (inline) legyenek"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "A hozzáférési tagfüggvények közvetlenek (inline) legyenek"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "A hozzáférési tagfüggvények publikusak legyenek"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2, %1. oldal"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Adja meg a diagram nevét"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Alaposztály hozzáadása"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "A diagram új neve:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Származtatott osztály hozzáadása"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Az egész diagram el lesz távolítva.\n"
-"Biztosan ezt szeretné?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Művelet hozzáadása"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Törölni szeretné a diagramot?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Attribútum hozzáadása"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Az átnevezés meg lett szakítva"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Alapfelület hozzáadása"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Nem lehet %1 típusú listaelemet átnevezni."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Származtatott felület hozzáadása"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "A funkció nem használható"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Alap érvényességi kör"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"A megadott név érvénytelen.\n"
-"Az átnevezési folyamat megszakadt."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Származtatott érvényességi kör"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "új_társítás"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Adja meg az állapot nevét"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "új_attribútum"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Adja meg az új állapot nevét:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "új_sablon"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Tevékenység megadása"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "új_művelet"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Nem megfelelő módon van használva egy társítás."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "új_literál"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Társítási hiba"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "új_mező"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "új állapot"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2485,11 +2519,6 @@ msgstr "E&xportálás képként..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Az összes diagram &exportálása képként..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Tulajdonságok"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Na&gyítási csúszka"
@@ -2574,21 +2603,28 @@ msgstr "Dokumentá&ció"
 msgid "Opening file..."
 msgstr "Fájl megnyitása..."
 
+#: 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 "Új dokumentum létrehozása..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Minden támogatott fájl (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Minden támogatott fájl (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Nem tömörített XMI-fájlok (*.xmi)\n"
 "*.xmi.tgz|Gzippel tömörített XMI-fájlok (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2-vel tömörített XMI-fájlok (*.xmi.tar.bz2)\n"
@@ -2618,6 +2654,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-vel tmörített XMI-fájl\n"
 "*|Minden fájl"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2626,6 +2666,10 @@ msgstr ""
 "%1 nevű fájl már létezik.\n"
 "Felül szeretné írni?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Felülírás"
@@ -2661,11 +2705,11 @@ msgstr "A vágólap tartalmának beillesztése..."
 
 #: 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 ""
-"Nem sikerült beilleszteni a vágólap tartalmát. Lehet, hogy az objektum típusa "
-"nem teszi lehetővé az adatok beillesztését."
+"Nem sikerült beilleszteni a vágólap tartalmát. Lehet, hogy az objektum "
+"típusa nem teszi lehetővé az adatok beillesztését."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2719,1265 +2763,1321 @@ msgstr "Minden fájl"
 msgid "Select Code to Import"
 msgstr "Válassza ki az importálandó kódot"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Az osztál&y neve:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "A szere&plő neve:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "új_attribútum"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Csomagnév:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "új_sablon"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "E&setnév használata:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "új_művelet"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "A csatl&akozási felület neve:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "új_literál"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "A komp&onens neve:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "új_mező"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "A tár&gy neve:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-modell"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Felsorolt né&v:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logikai nézet"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Az adattípus ne&ve:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Eseti nézet használata"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entitásné&v:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponens-nézet"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Sz&tereotípus-név:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Elhelyezési nézet"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Cso&magnév:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entitásviszony-modell"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bsztrakt osztály"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Adattípusok"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bsztrakt használat"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Az aktuális fájl tartalma megváltozott.\n"
+"El szeretné menteni?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Végrehajtható"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "%1 nevű fájl nem létezik."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Kirajzolás mint"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "A(z) %1 fájl valószínűleg hibás."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Alapértelmezés"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Nem található XMI-fájl a(z) %1 tömörített fájlban."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Köny&vtár"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Hiba történt a(z) %1 kitömörített fájl betöltésekor."
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "Táb&lázat"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Hiba történt a(z) %1 fájl betöltésekor."
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublic"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Hiba történt a(z) %1 fájl feltöltése közben"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivát"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "eseti diagram használata"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "osztálydiagram"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "&Implementáció"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sorozatdiagram"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Az osztály neve:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "csoportmunka-diagram"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "A példány neve:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "állapotdiagram"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Kirajzolás szereplőként"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "tevékenységi diagram"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Több példány"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponensdiagram"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "A felbontás megjelenítése"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "elhelyezési diagram"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "A komponens neve:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "entitásviszony-diagram"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Csomópontnév:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "A diagramnak adott név érvénytelen."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Sztereotípus-név:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Egy másik diagram már használja ezt a nevet."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"A választott nyelv már\n"
-"foglalt.\n"
-"A név visszaállt az alapértelmezésre."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "A név nem egyedi"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Vonal:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Kitö&ltés:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "A&lapértelmezés"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "K&itöltés használata"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Tevékenységek"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Új tevékenység..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Átnevezés"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Új tevékenység"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "A tevékenység átnevezése"
+"A megadott név nem egyedi.\n"
+"Biztosan ezt szerette volna?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "A tevékenység új neve:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "A név használata"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "A társítás tulajdonságai"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Adja meg az új nevet"
 
-#: 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 "Általános beállítások"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Biztosan törölni szeretné a(z) %1 diagramot?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Szerepek"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "A diagram törlése"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Szerepbeállítások"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "A dokumentum beállítása..."
 
-#: 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 "Betűtípus-beállítások"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Az objektumhivatkozások feloldása..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "A társítás betűtípusa"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML-elemek betöltése..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "A sablon tulajdonságai"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Diagramok betöltése..."
 
-#: 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 "Általános tulajdonságok"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "Típ&us:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Könyvtár külsővé tétele"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "Né&v:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Adja meg a modell nevét"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Érvénytelen sablonnevet adott meg."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "A modell új neve:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "A sablon neve érvénytelen"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Nézetek"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"A sablonparaméter nevének megadott név már le van foglalva ebben a műveletben."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "A sablonnév nem egyedi"
+"A megadott név érvénytelen.\n"
+"A létrehozási folyamat megszakadt."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Az entitásattribútum jellemzői"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Érvénytelen név"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Alapértelmezés:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"A megadott név nem egyedi!\n"
+"A létrehozási folyamat megszakadt."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Hossz/értékek:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "A létrehozás meg lett szakítva"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "A&utomatikus növelés"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Listanézet betöltése..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "A Null en&gedélyezése"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Csak üres könyvtárat lehet törölni."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attribútumok:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "A könyvtár nem üres"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexelés"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Az átnevezés meg lett szakítva"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "N&incs"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Nem lehet %1 típusú listaelemet átnevezni."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Elsődleges"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "A funkció nem használható"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"A megadott név érvénytelen.\n"
+"Az átnevezési folyamat megszakadt."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "Eg&yedi"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2, %1. oldal"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Érvénytelen entitásattribútum-nevet adott meg."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Adja meg a diagram nevét"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Érvénytelen entitásattribútum-név"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "A diagram új neve:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Az entitásattribútum nevének megadott név már le van foglalva ebben a "
-"műveletben."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Az entitásattribútum neve nem egyedi"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Megjelenítés"
+"Az egész diagram el lesz távolítva.\n"
+"Biztosan ezt szeretné?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Osztálymegjelenítési jellemzők"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Törölni szeretné a diagramot?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "A diagram színei"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Nézet exportálása..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "A megadott név érvénytelen."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Hiba történt a kép exportálása közben:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "A megadott név nem egyedi."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"A kijelölt fájl (%1) már létezik.\n"
+"Felül szeretné írni?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Típus:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "A fájl már létezik"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Az Umbrello beállításai"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Nem sikerült létrehozni egy könyvtárt: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Felhasználói felület"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Üres diagramot nem lehet menteni"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "A felhasználói felület beállításai"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Hiba történt egy diagram mentése közben: %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Vonalszín:"
+#: 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 ""
+"A Shift vagy a Ctrl lenyomva tartásával lehet X irányba mozgatni. A Shift és "
+"a Ctrl lenyomva tartásával lehet Y irányba mozgatni. A mozgatást a jobb "
+"egérgombbal történő kattintással lehet megszakítani."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Alapé&rtelmezett szín"
+#: 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 ""
+"A Shift vagy a Ctrl lenyomva tartásával lehet X irányba mozgatni. A Shift és "
+"a Ctrl lenyomva tartásával lehet Y irányba mozgatni. Az átméretezést a jobb "
+"egérgombbal történő kattintással lehet megszakítani."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Kitöltési szín:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objektum"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Az alapértelme&zett szín"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Szinkron üzenet"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Vonalvastagság:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Aszinkron üzenet"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Az a&lapértelmezett vastagság"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Címke"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "A &kitöltési szín használata"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Megjegyzés"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "A visszavonási lehetőség bekapcsolása"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Doboz"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Lapozós diagramok használata"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Viszony"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Új C++/Java/Ruby-generátorok használata"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Egyirányú társítás"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Ferde társítási vonalak használata"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Megvalósítás (általánosítás/realizáció)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatikus mentés"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Napló (mély)"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Az automatikus mentés bekapcs&olása"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Napló (nem mély)"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Az automatikus mentés időköze (min):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Egyesítés"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Az automatikus mentés utótagjának beállítása:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Elágaztatás"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Az automatikus mentés során a fájl  ~/autosave.xmi néven lesz elmentve, ha a "
-"fájl még egyszer sem volt kézzel elmentve.</p>"
-"<p>Ha már legalább egyszer el lett mentve, akkor az automatikusan mentett "
-"változat a fájl könyvtárába kerül, és az itt megadott kiterjesztés lesz "
-"hozzáfűzve a fájlnévhez.</p>"
-"<p>Ha a kiterjesztés megegyezik a fájlnév kiterjesztésével, akkor az "
-"automatikus mentés az eredeti fájlt fogja felülírni.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Csomópont"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Indulás"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Választás"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Indítási kép"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Tevékenységváltozás"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "Mai ti&pp"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Üzenet"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Az utolsó pr&ojekt betöltése"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "NEM DEFINIÁLT"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Új projekt kezdése:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Kiválasztás"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Nincs diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Osztálydiagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Esetdiagram használata"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sorozatdiagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Csoportmunka-diagram"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "A műveletek megjelenítése"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Állapotdiagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Tevékenységdiagram"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "A diagram törlése"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponensdiagram"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Elhelyezési diagram"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Általánosítás"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Osztálybeállítások"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "A lát&hatóság megjelenítése"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Az attribútumok megjelenítése"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "A társítás neve"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "A műveletek megjelenítése"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "A szt&ereotípus megjelenítése"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Az attribútumaláírás megjelenítése"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "A csomag megjelenítése"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Alapértelmezés"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Kezdeti hatókör"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Alapértelmezett attribútum-hatókör:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Vonás, vonás (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "A művelet alapértelmezett hatóköre:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Vonás, csillag (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kódgenerálás"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stílus:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Kódgenerálási beállítások"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++-os kódgenerálás</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "A kódnézegető beállításai"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Tagfüggvény-megvalósítás generálása"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "A művelet tulajdonságai"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Az alábbiakat kell használni a generált kód osztályaiban:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Ab&sztrakt művelet"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Érvényességi kö&r (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Lekérdezés (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Változó</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Véde&tt"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "&Implementáció"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Paraméterek"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Ú&j paraméter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Sztring</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Érvénytelen nevet adott egy paraméternek."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Érvénytelen paraméternév"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"A paraméter nevének választott név\n"
-"már le van foglalva ebben a műveletben."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globális?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "A paraméter neve nem egyedi"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"A paraméter nevének megadott név már le van foglalva ebben a műveletben."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Az osztály neve"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Érvénytelen műveletnevet adott meg."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Include fájl</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "A művelet neve nem egyedi"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projektgenerálás"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Már létezik művelet ezzel az aláírással itt: %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "ANT fordítási dokumentum létrehozása"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Válasszon más nevet vagy paraméterlistát."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "A tagfüggvények automatikus létrehozása"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Az 'A' szerep tulajdonságai"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Üres konstruktorok"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "A 'B' osztály tulajdonságai"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Társításelérési tagfüggvények"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Az 'A' szerep láthatósága"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Attribútumelérési tagfüggvények"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "A 'B' szerep láthatósága"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "A szülőobjektumból"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Az 'A' szerep módosíthatósága"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Alapértelmezett attribútumelérési hatókör:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "A 'B' szerep módosíthatósága"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Alapértelmezett társítási mező-hatókör:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "A tartalmazott elemek"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "A szülőobjektum szerepéből"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Megjegyzések (dokumentáció)"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java kódgenerálás</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Új attr&ibútum..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Kereszt (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Ú&j művelet..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Begin-End (=begin =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Sablonok"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby kódgenerálás</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Ú&j sablon..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Nyelv"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Felsorolt nevek"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Könyvtárak"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Ú&j felsorolt név..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "A generált fájlok ebbe a könyvtárba kerüljenek:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entitás-attribútumok"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Ta&llózás..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Új entitás-attr&ibútum..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&Tallózás..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Kezdeti tevékenység"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Fejlécfájlok beillesztése ebből a könyvtárból:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Végső tevékenység"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"A kódgenerátor által létrehozott fájlok ebbe a könyvtárba fognak kerülni"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tevékenységtípus:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Az ebben a könyvtárban található fájlok fejlécfájlként fognak szerepelni a "
+"generált kódban"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Tevékenységnév:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Felülírási mód"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "A grafikus elemek színei"
+#: 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 ""
+"Ha a kódgenerátor új fájlt akar létrehozni,\n"
+"de a fájl már létezik:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attribútumjellemzők"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Felülírás"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Ke&zdeti érték:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "A már létező fájlok felülírása a célkönyvtárban"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Publikus"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Rákér&dezés"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Érvénytelen attribútumnevet adott meg."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Ha egy adott nevű fájl már létezik, a program kérdezze meg a felhasználótól, "
+"mi a teendő"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Érvénytelen attribútumnév"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Más né&v használata"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"Az attribútum nevének megadott név már le van foglalva ebben a műveletben."
+"Ha egy fájl már létezik a célkönyvtárban, válasszon egy másik nevet egy "
+"utótag megadásával"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Az attribútum neve nem egyedi"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formázás"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Művelet kiválasztása"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Sorok"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sorozatszám:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Sorvégződési stílus:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Osztályművelet:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Behúzási típus:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Egyéni művelet:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Behúzási távolság:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramok"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Szűrő"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "A &jelenlegi diagram"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "A&z összes diagram"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Nincs behúzás"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "A kijelölt diagram&ok"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulátor"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "A diagram tí&pusa"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Szóköz"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Kiválasztás"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "A megjegyzések részletessége"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Csoportmunka"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"A sza&kaszmegjegyzést akkor is létre kell\n"
+"hozni, ha a szakasz üres"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sorozat"
+#: 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 ""
+"Megjegyzésekben jelzi, hogy a kód melyik szakasza van éppen (public, private "
+"stb.) egy osztályon belül, akkor is, ha a megjegyzés tartalma üres"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Elhelyezés"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "A megjegyzések létrehozása &akkor is, ha üresek"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Nincs kiválasztva diagram."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Az osztályok és tagfüggvények megj&egyzéseinek létrehozása akkor is, ha "
+"üresek"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Megjelenítési beállítások"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Nyelvi beállítások"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribútumbeállítások"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Kódgenerálási varázsló"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Műveleti beállítások"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Osztályválasztás"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "A sablonok beállításai"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Helyezze az összes olyan osztályt a jobb oldali listába,\n"
+"amelyhez kódot szeretne generáltatni"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "A felsorolt nevek beállításai"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Osztály hozzáadása kódgeneráláshoz"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Az entitás-attribútumok beállításai"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "A kijelölt osztályok"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "A tartalom beállításai"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Osztály eltávolítása a kódgenerálásból"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Társítások"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "A rednelkezésre álló osztályok"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Osztálytársítások"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Kódgenerálási állapot"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Mű&veletek"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Nyomja meg a Generálás gombot a kódgenerálás elkezdéséhez"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "Láth&atóság"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Kódgenerálási állapot"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Műveletaláí&rás"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "A rejtett blokkok megjelenítése"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Csomag"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">ide jön a komponens neve</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Attribút&umok"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Sztereotí&pus"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "A blokktípus megjelenítése"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attribútuma&láírás"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Színek"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Kirajzolás körként"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Betűtípus:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Kezdeti állapot"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papír:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Végállapot"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "A kijelölés:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Az állapot típusa:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML objektumblokk:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Az állapot neve:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Rejtett blokk:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "A grafikus elemek színe"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Nem szerkeszthető szöveg:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "új_osztály"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Szerkeszthető szöveg:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Új osztály"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "A diagram tulajdonságai"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Osztályattribútumok"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Nagyítás:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Osztályműveletek"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "A paraméter tulajdonságai"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "A rá&cs megjelenítése"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Az irány átadása"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Illesztés a &rácshoz"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Az illesztési rács mérete"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"Az \"in\" csak olvasható, az \"out\" csak írható, az \"inout\" írható és "
-"olvasható paraméter."
+"A komponensek mérete mindig a rácsméret egész számszorosa legyen.\n"
+"Ha az 'Illesztés a rácshoz' opció be van jelölve, a komponens mind a négy "
+"oldala a rácshoz fog illeszkedni."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generálás"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Rácstávolság:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Befejezés"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "A kód generálása megtörtént"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Nem történt kódgenerálás"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Vonalvastagság:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Még nem történt kódgenerálás"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Az összes nézet exportálása"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Nem létezik %1 nevű könyvtár. Létre szeretné hozni most?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "A diagramok ebbe a &könyvtárba kerüljenek:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "A kimeneti könyvtár nem létezik"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "A képek mentéséhez használt alapkönyvtár:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "A könyvtár létrehozása"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Ké&ptípus:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Nem kell létrehozni"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Könyv&tárak használata"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"A könyvtárt nem sikerült létrehozni.\n"
-"Ellenőrizze, hogy van-e írási jogosultsága a szülőkönyvtárban, vagy válasszon "
-"egy másik, érvényes könyvtárat."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Hiba történt a könyvtár létrehozása közben"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Válasszon egy érvényes könyvtárat."
+"A célkönyvtárban jöjjön létre a fastruktúra, amelyben elrendezve\n"
+"a nézetek a dokumentumban szerepeltek"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"A kimeneti könyvtár létezik, de nem lehet bele írni.\n"
-"Állítsa be a szükséges jogosultságokat vagy válasszon egy másik könyvtárat."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Nem sikerült írni a kimeneti könyvtárba"
+"A nézetek a dokumentum mappáiban vannak elhelyezve. A nézetek tárolására "
+"szolgáló fastruktúra megőrizhető a célkönyvtárban, ha bejelöli ezt az "
+"opciót.\n"
+"Csak a felhasználó által létrehozott mappák jönnek létre az alapkönyvtárban "
+"(logikai nézet, esetnézet stb. nem jön létre)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 nem könyvtár, válasszon egy érvényes könyvtárat."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "A szerep módosíthatósága"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Válasszon egy érvényes könyvtárat"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "A szerep láthatósága"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "A célként megadott fájl már létezik"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportálás"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"%1 nevű fájl már létezik itt: %2.\n"
-"\n"
-"A fájl felülírható, más néven új fájl hozható\n"
-"létre, vagy a fájl generálása kihagyható."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "Alk&almazás a többi fájlra is"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Felülírás"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Hasonló fájlnév generálása"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Nem ke&ll fájlt létrehozni"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nincs módosítható beállítás.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicitás"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Adja meg a multiplicitást:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "A társítás neve"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Adja meg a társítás nevét:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "A szerep neve"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Adja meg a szerep nevét:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Adja meg a művelet nevét:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Adja meg az új szöveget:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "HIBA"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "A szöveg megváltoztatása"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Balra igazítás"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Jobbra igazítás"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Felülre igazítás"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "Ú&j"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alulra igazítás"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Meg&jelenítés"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Függőlegesen középre igazítás"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Nagyítás:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Vízszintesen középre igazítás"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Programkód"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Függőlegesen elosztás"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Ak&tív nyelv"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Vízszintesen elosztás"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Igazításhoz legalább két objektumot (pl. osztályt, szereplőt) kell "
-"kiválasztani. Társításokat nem lehet igazítani."
+"<p>Üdvözöljük az Umbrellóban!</p>\n"
+"<p>Az UML-diagramok objektumalapú szoftver tervezését és dokumentálását "
+"segítik.  <a href=\"help:/umbrello\">Az Umbrello kézikönyvben</a> bevezető "
+"szintű ismertető található az UML-ről.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Ez egy foglalt kulcsszó a kódgenerálhoz választott nyelvben."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Foglalt kulcsszó"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Nézet exportálása..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Üdvözöljük az Umbrello 1.5-ben! Néhány új lehetőség ebben a verzióban: "
+"társítási osztályok, Ruby-alapú kódgenerálás, külsővé tehető könyvtárak, "
+"felületek átalakítása osztályokká.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Hiba történt a kép exportálása közben:\n"
+"<p>A lapozós diagramok és a külsővé tett könyvtárak használata kizárja "
+"egymást. Ha külső könyvtárakat szeretne használni, akkor az Általános lapon "
+"kapcsolja ki a &quot;Lapozós diagramok használata&quot; opciót.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"A kijelölt fájl (%1) már létezik.\n"
-"Felül szeretné írni?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "A fájl már létezik"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "új_szereplő"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "új_felhasználás"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "új_csomag"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "új_komponens"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "új_csomópont"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "új_tárgy"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "új_felület"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "új_adattípus"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "új_felsorolt"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "új_entitás"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "új_könyvtár"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "új_objektum"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Üres"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Hibás formátumú argumentum"
+"<p>A diagram legtöbb eleme nem méretezhető át, hanem automatikusan "
+"állapítják meg a méretet, a tartalom alapján.\n"
+"A dobozok, megjegyzések és sorozatdiagram-üzenetek átméretezhetők a piros "
+"négyzetre kattintva, húzással.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Ismeretlen argumentumtípus"
+#: 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 ""
+"<p>Ha egy már létező osztályt szeretne hozzáadni a diagramhoz, húzza át "
+"annak bejegyzését a fastruktúrából.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nem megengedett eljárásnév"
+#: 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 ""
+"<p>Az Umbrello átfaktorizálási szolgáltatása lehetővé teszi műveletek "
+"mozgatását egy osztály és annak szülő- ill. származtatott osztályai\n"
+"között.\n"
+"Kattintson egy osztályra a jobb gombbal az átfaktorizálási ablak "
+"előhívásához.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Ismeretlen visszaadási típus"
+#: 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 ""
+"<p>Sorozatdiagram-objektumhoz tartozhat destruktordoboz és szereplőként is "
+"megjelenhet. Kattintson duplán az egyikre\n"
+"a Tulajdonságok ablak előhívásához.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Ismeretlen hiba"
+#: 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 ""
+"<p>A sorozatdiagram-üzenetek konstruktorként is használhatók. Kattintson az "
+"objektumdobozra (a függőleges vonal helyett), ha konstruktorrá szeretné "
+"változtatni.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Alaposztály hozzáadása"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>A sorozatdiagramok saját maguknak is küldhetnek üzenetet. Kattintson "
+"újból ugyanarra a függőleges vonalra saját magának történő üzenet "
+"készítéséhez.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Származtatott osztály hozzáadása"
+#: 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 ""
+"<p>Ha külső fájl betöltésekor semmi sem jelenik meg a listanézetben, "
+"próbálja elmenteni a modellt más néven,\n"
+"zárja be, majd töltse be újból a fájlt. Ilyenkor általában megjavul a "
+"listanézet.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Művelet hozzáadása"
+#: 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 ""
+"<p>A Másolás/Kivágás művelettel az ábra PNG képként a vágólapra helyezhető, "
+"ahonnan beilleszthető\n"
+"a KWordbe vagy egy másik alkalmazásba.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Attribútum hozzáadása"
+#: 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 ""
+"<p>A társításoknak nem kell feltétlenül egy vonalra esniük, dupla "
+"kattintással mozgatható pont nyitható rajtuk.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Alapfelület hozzáadása"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>A beállítóablakban be lehet kapcsolni az automatikus mentést.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Származtatott felület hozzáadása"
+#: 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 ""
+"<p>Kérjük jelezze, hogy milyen funkciókat hiányol a programban.\n"
+"A Segítség menü Hibabejelentés menüpontjával vagy közvetlenül az uml-devel\n"
+"fejlesztői listára küldve jelezheti kívánságait, javaslatait.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Alap érvényességi kör"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>A kijelölt objektumok törléséhez nyomja meg a Del vagy Backspace "
+"billentyűt.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Származtatott érvényességi kör"
+#: 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 ""
+"<p>Kérjük, hogy a programban talált hibákról értesítsen minket. \n"
+"A Segítség menü Hibabejelentés menüpontjával ez könnyen megtehető.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Nem sikerült létrehozni egy könyvtárt: %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 ""
+"<p>Az Esc lenyomásakor a kijelölt eszköz lesz az aktuális.\n"
+"A Backspace-szel az előzőleg használt eszközre lehet váltani.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Üres diagramot nem lehet menteni"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>A Ctrl+A lenyomásával lehet az összes diagramot kiválasztani.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Hiba történt egy diagram mentése közben: %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 ""
+"<p>Új osztály létrehozásához, tulajdonságainak beállításához használja az "
+"Osztálylétrehozási varázslót a Programkód menüben.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "új_sztereotípus"
diff --git a/tde-i18n-is/messages/tdesdk/umbrello.po b/tde-i18n-is/messages/tdesdk/umbrello.po
index f2e56f0f3c8..9a5f33c9276 100644
--- a/tde-i18n-is/messages/tdesdk/umbrello.po
+++ b/tde-i18n-is/messages/tdesdk/umbrello.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\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-05-21 17:15+0000\n"
 "Last-Translator: Richard Allen <ra@ra.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -14,289 +14,511 @@ 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"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
 
-#: docgenerators/main.cpp:47
-msgid "File to transform"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
 
-#: 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 ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
+#: aligntoolbar.cpp:41
+msgid "Align Right"
 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:42
+msgid "Align Top"
 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:43
+msgid "Align Bottom"
 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"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
 msgstr ""
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
+msgstr ""
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+
+#: aligntoolbar.cpp:384
+msgid "Information"
+msgstr ""
+
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: association.cpp:84
+msgid "Generalization"
+msgstr ""
+
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
+
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
 msgstr ""
 
 #: association.cpp:87 worktoolbar.cpp:248
 msgid "Association"
 msgstr ""
 
+#: 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"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
 msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
+#: 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"
+#: 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"
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+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."
+msgstr ""
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr ""
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid "Cannot create the folder:\n"
+msgstr ""
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr ""
+
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr ""
+
+#: 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 ""
 
-#. 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
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr ""
+
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
+
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+msgid "Namespace"
+msgstr ""
+
+#: 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 ""
 
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
 msgstr ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
 msgstr ""
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
 msgstr ""
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
 msgstr ""
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
 msgstr ""
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
 msgstr ""
 
-#: worktoolbar.cpp:278
-msgid "Fork"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 msgstr ""
 
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
 msgstr ""
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
 msgstr ""
 
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
 msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
 msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
 msgstr ""
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: 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
+msgid "Properties"
 msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
 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."
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 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."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
+#: 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 ""
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
+#: 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 ""
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
+#: 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 ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
+#: 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"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: 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 ""
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
+#: 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 ""
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr ""
+
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr ""
+
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr ""
+
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+msgid "Delete"
+msgstr ""
+
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr ""
+
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
 #: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
@@ -304,1240 +526,1195 @@ msgstr ""
 msgid "new activity"
 msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: 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 ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#: 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"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 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/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, no-c-format
+msgid "Multiplicity:"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: 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 ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: 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 ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
+#: 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 ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, no-c-format
+msgid "Implementation"
 msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, no-c-format
+msgid "Frozen"
 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"
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, no-c-format
+msgid "Add only"
 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:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
 msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
 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/classgenpage.cpp:54
+msgid "Package &name:"
 msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
 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/classgenpage.cpp:58
+msgid "Interface &name:"
 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/classgenpage.cpp:60
+msgid "Component &name:"
 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/classgenpage.cpp:62
+msgid "Artifact &name:"
 msgstr ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
 msgstr ""
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
 msgstr ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
 msgstr ""
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
 msgstr ""
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
 msgstr ""
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
 msgstr ""
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
 msgstr ""
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
 msgstr ""
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
 msgstr ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
 msgstr ""
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 msgstr ""
 
-#: classifier.cpp:201
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
 msgstr ""
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
+#: 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 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
+#: 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"
+#: 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 ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, no-c-format
-msgid "Slash-Star (/**  */)"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 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"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
 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:118
+msgid "Display Options"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+msgid "Code Generation Options"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: 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 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"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
 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"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create 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"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: 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 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: 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 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgid "Code Viewer"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
 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/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, 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:"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
 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/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 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/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr ""
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
+"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 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Windows (\"\\r\\n\")"
+"\"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 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 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:30
+msgid "Umbrello Setup"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
 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:54
+msgid "Line color:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
 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:73
+msgid "Line width:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
 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:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
 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:126
+msgid "Autosave"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
 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:136
+msgid "Select auto-save time interval (mins):"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
+#: dialogs/settingsdlg.cpp:148
+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>"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
 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:172
+msgid "&Load last project"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr ""
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
 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/settingsdlg.cpp:294
+msgid "Code Generation"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
 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/statedialog.cpp:130
+msgid "Widget Color"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 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/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen 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/umlattributedialog.cpp:164
+msgid "Attribute 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/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
 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/umlentityattributedialog.cpp:73
+msgid "&Default value:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 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/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 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/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
 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/umlentityattributedialog.cpp:115
+msgid "&Primary"
 msgstr ""
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 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/umlentityattributedialog.cpp:121
+msgid "&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/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 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/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
 msgstr ""
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 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/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name 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/umloperationdialog.cpp:50
+msgid "Operation Properties"
 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/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 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"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 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"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
 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"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
 msgstr ""
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
 msgstr ""
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 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"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr ""
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
 msgstr ""
 
-#: tips.txt:108
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+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 ""
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr ""
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr ""
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+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 ""
+
+#: 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 ""
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr ""
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr ""
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr ""
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr ""
+
+#: 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 ""
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -1592,6 +1769,10 @@ msgstr ""
 msgid "Select Operation..."
 msgstr ""
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr ""
@@ -1641,6 +1822,18 @@ msgstr ""
 msgid "Rename..."
 msgstr ""
 
+#: 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 ""
@@ -1669,14 +1862,26 @@ msgstr ""
 msgid "Import Classes..."
 msgstr ""
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr ""
+
 #: 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 ""
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1685,10 +1890,18 @@ msgstr ""
 msgid "Folder"
 msgstr ""
 
+#: 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 ""
@@ -1725,6 +1938,18 @@ msgstr ""
 msgid "Export as Picture..."
 msgstr ""
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr ""
+
+#: 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 ""
@@ -1745,26 +1970,10 @@ msgstr ""
 msgid "Collaboration Diagram..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr ""
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr ""
-
 #: 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 ""
@@ -1777,11 +1986,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr ""
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1806,14 +2010,6 @@ msgstr ""
 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 ""
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1842,10 +2038,26 @@ msgstr ""
 msgid "Package..."
 msgstr ""
 
+#: 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 ""
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr ""
@@ -1890,6 +2102,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 ""
@@ -1924,192 +2144,101 @@ 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 ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: 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 ""
-
-#: 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
-msgid "Namespace"
-msgstr ""
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: 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"
+#: model_utils.cpp:264
+msgid "new_folder"
 msgstr ""
 
-#: 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"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: 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
@@ -2124,100 +2253,65 @@ msgstr ""
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr ""
-
-#: 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"
-msgstr ""
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: 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
@@ -2372,11 +2466,6 @@ msgstr ""
 msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr ""
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2461,14 +2550,21 @@ msgstr ""
 msgid "Opening file..."
 msgstr ""
 
+#: 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 ""
 
 #: 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"
@@ -2495,12 +2591,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 ""
@@ -2536,8 +2640,8 @@ msgstr ""
 
 #: 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
@@ -2592,1223 +2696,1215 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
+#: umldoc.cpp:108
+msgid "Component View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
+#: 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:149
-msgid "&Library"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
+#: umldoc.cpp:942
+msgid "state diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
+#: umldoc.cpp:944
+msgid "activity diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: umldoc.cpp:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 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:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr ""
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr ""
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr ""
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr ""
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr ""
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
 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"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 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"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 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"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
+#: umllistview.cpp:1007
+msgid "Views"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr ""
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
+#: 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:60
-msgid "D&efault Color"
+#: 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:63
-msgid "Fill color:"
+#: worktoolbar.cpp:245
+msgid "Object"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
+#: worktoolbar.cpp:251
+msgid "Label"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
+#: worktoolbar.cpp:252
+msgid "Note"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
+#: worktoolbar.cpp:253
+msgid "Box"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: worktoolbar.cpp:257
+msgid "Relationship"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
+#: worktoolbar.cpp:277
+msgid "Join"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: worktoolbar.cpp:278
+msgid "Fork"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
+#: worktoolbar.cpp:290
+msgid "Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
+#: worktoolbar.cpp:302
+msgid "Select"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: autolayout/newautolayoutdialog.ui:88
+#, no-c-format
+msgid "Shape separation"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: autolayout/newautolayoutdialog.ui:137
+#, no-c-format
+msgid "Ce&nter Diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: autolayout/newautolayoutdialog.ui:183
+#, no-c-format
+msgid "Generalization as Ed&ges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
+#: autolayout/newautolayoutdialog.ui:238
+#, no-c-format
+msgid "Association as Ed&ges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
+#: autolayout/newautolayoutdialog.ui:412
+#, no-c-format
+msgid "&Restore Default"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: 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/umlattributedialog.cpp:42
-msgid "Attribute Properties"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
+#: 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/classpropdlg.cpp:118
-msgid "Display Options"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: 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 ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: 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."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr ""
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr ""
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr ""
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr ""
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr ""
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr ""
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr ""
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr ""
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+"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 ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
 msgstr ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
 msgstr ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: umbrelloui.rc:35
+#, no-c-format
+msgid "&Zoom"
 msgstr ""
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
 msgstr ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
 msgstr ""
 
-#: aligntoolbar.cpp:383
+#: tips:3
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr ""
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+"<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 ""
 
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr ""
-
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr ""
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr ""
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr ""
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr ""
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr ""
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr ""
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr ""
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr ""
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr ""
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr ""
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr ""
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr ""
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr ""
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr ""
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
+"<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 ""
diff --git a/tde-i18n-it/messages/tdesdk/umbrello.po b/tde-i18n-it/messages/tdesdk/umbrello.po
index 16d736b1156..8ddf8834c03 100644
--- a/tde-i18n-it/messages/tdesdk/umbrello.po
+++ b/tde-i18n-it/messages/tdesdk/umbrello.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-08-22 09:01+0200\n"
 "Last-Translator: Federico Zenith <federico.zenith@member.fsf.org>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -18,248 +18,209 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Generatore di codice autonomo del modellatore UML Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "File da trasformare"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Il file XSLT da usare"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 di Gael de Chalendar (detto Kleag), (c) 2002-2006 degli autori del "
-"modellatore UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autori del modellatore UML Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Federico Zenith,Daniele Medri"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Esportazione di tutte le viste..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "federico.zenith@member.fsf.org"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Si sono verificati degli errori nell'esportazione delle immagini:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Inserisci il nome dell'attività"
 
-#: 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 "C'è stato un problema salvando il file: %1"
+#: 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 "Inserisci il nome della nuova attività:"
 
-#: 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 "Errore di salvataggio"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Allinea a sinistra"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Oggetto"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Allinea a destra"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Messaggio sincrono"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Allinea in alto"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Messaggio asincrono"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Allinea in basso"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Associazione"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Allinea verticalmente al centro"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Contenimento"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Allinea orizzontalmente al centro"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Àncora"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Allinea verticalmente distribuito"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etichetta"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Allinea orizzontalmente distribuito"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Nota"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Per l'allineamento devi selezionare almeno due oggetti come classi o attori. "
+"Non puoi allineare associazioni."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Area"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formattazione"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Attore"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, fuzzy, no-c-format
+msgid "&OK"
+msgstr "&Ok"
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dipendenza"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalizzazione"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregazione"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relazione"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Associazione direzionale"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementa (Generalizzazione/Realizzazione)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composizione"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Casi d'uso"
-
-#. 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 "Classe"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Stato iniziale"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Stato finale"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Ramifica/fondi"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Separa/unisci"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pacchetto"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Componente"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nodo"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dipendenza"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Manufatto"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Associazione"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfaccia"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Autoassociazione"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tipo di dati"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Messaggio di collaborazione"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumerazione"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Messaggio di sequenza"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entità"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Automessaggio di collaborazione"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Cronologia dettagliata"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Automessaggio di sequenza"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Cronologia breve"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Contenimento"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Unisci"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composizione"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Separa"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizzazione"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Giunto"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Associazione Uni"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Scelta"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Àncora"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Transizione di stato"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Transizione di attività"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Attività"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stato"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Molteplicità"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Attività finale"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Inserisci la molteplicità:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Attività iniziale"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nome dell'associazione"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Messaggio"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Inserisci il nome dell'associazione:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "NON DEFINITO"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nome del ruolo"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Seleziona"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Inserisci il nome del ruolo:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Un'operazione con gli stessi nome e firma esiste già. Non puoi aggiungerla "
+"di nuovo."
+
+#: 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 "Questo è un nome non valido."
+
+#: 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 "Nome non valido"
+
+#: 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 "Questo nome è già in uso."
+
+#: 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 "Non è un nome univoco"
 
 #: 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."
+"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 ""
 "Almeno uno degli elementi negli appunti non può essere incollato perché un "
-"elemento con lo stesso nome esiste già. Ogni altro elemento è stato incollato."
+"elemento con lo stesso nome esiste già. Ogni altro elemento è stato "
+"incollato."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -278,10 +239,8 @@ msgid "Cannot Open File"
 msgstr "Impossibile aprire il file"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Impossibile creare la cartella:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Impossibile creare la cartella:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1360 +254,1521 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Impossibile creare la cartella"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Inserisci il nome dello stato"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Impostazioni generali"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Inserisci il nome del nuovo stato:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Il pacchetto è un namespace"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Inserisci attività"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Distruttori virtuali"
 
-#: 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 "Inserisci il nome della nuova attività:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Genera costruttori vuoti"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nuova attività"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Genera metodi delle funzioni d'accesso"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Modello UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Le operazioni sono in linea"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Vista logica"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Le funzioni d'accesso sono in linea"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Vista dei casi d'uso"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Le funzioni d'accesso sono pubbliche"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Vista componenti"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importazione del file: %1 Avanzamento: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Vista di dispiegamento"
+#: 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 "Pronto."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Modello di relazioni tra entità"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "L'ambito %1 è un namespace o una classe?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipi di dati"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "L'importazione C++ richiede il tuo aiuto"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Il file corrente è stato modificato.\n"
-"Vuoi salvarlo?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Namespace"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Il file %1 non esiste."
+#: 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 "Classe"
 
-#: 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 "Errore di caricamento"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Errore interno"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Il file %1 sembra essere difettoso."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Errore di sintassi prima di '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Non è stato trovato nessun file XMI nel file compresso %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Errore di analisi prima di '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "C'è stato un problema caricando il file estratto: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<finefile>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "C'è stato un problema caricando il file: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "attesa espressione"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "C'è stato un problema durante l'invio del file: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Errore di sintassi della dichiarazione"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagramma dei casi d'uso"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} atteso"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagramma delle classi"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace atteso"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagramma di sequenza"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ atteso"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagramma di collaborazione"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Nome del namespace atteso"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagramma di stato"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Devi dichiarare uno specificatore di tipo"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagramma di attività"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "dichiarazione attesa"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagramma dei componenti"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "espressione costante attesa"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagramma di dispiegamento"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' atteso"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagramma di relazioni tra entità"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} mancante"
 
-#: 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 "Nome"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Inizializzatori membri attesi"
 
-#: 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 "Inserisci nome:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Specificatore della classe base atteso"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Questo è un nome non valido per un diagramma."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Istruzioni di inizializzazione attese"
 
-#: 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 "Nome non valido"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identificatore atteso"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Un diagramma sta già usando questo nome."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "ID del tipo attesa"
 
-#: 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 "Non è un nome univoco"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Nome della classe atteso"
 
-#: 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 "Questo è un nome non valido."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "condizione attesa"
 
-#: 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 "Questo nome è già in uso."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "affermazione attesa"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Il nome inserito non era univoco.\n"
-"È quello che volevi?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "inizializzazione di for attesa"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nome non univoco"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch attesa"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Usa nome"
+#: 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 "&Proprietà"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Inserisci il nuovo nome"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Attività iniziale"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Sei sicuro di voler eliminare il diagramma %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Fine attività"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Elimina diagramma"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Ramifica/fondi"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Impostazione del documento..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Separa/unisci"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Risoluzione delle referenze degli oggetti..."
+#: 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 "Generale"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Caricamento elementi UML..."
+#: 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 "Proprietà generali"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Caricamento diagrammi..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tipo attività:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Diagramma kde-uml"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nome attività:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Documentazione"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Esternalizza cartella"
+#: 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 "Tipo di carattere:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Inserisci il nome del modello"
+#: 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 "Impostazioni caratteri"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Inserisci il nuovo nome del modello:"
+#: 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 "Colore"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Viste"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Colori degli oggetti"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Il nome inserito non era valido.\n"
-"Il processo di creazione è stato annullato."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Attività"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nome non valido"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nuova attività..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Il nome inserito non era univoco!\n"
-"Il processo di creazione è stato annullato."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Elimina àncora"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Creazione annullata"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Rinomina"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Caricamento vista a elenco..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nuova attività"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "La cartella deve essere svuotata prima di essere eliminata."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nuova attività"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Cartella non vuota"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Rinomina attività"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Un'operazione con gli stessi nome e firma esiste già. Non puoi aggiungerla di "
-"nuovo."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Inserisci il nuovo nome dell'attività:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Inserisci il nome dell'attività"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nuovo stato"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipo:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalizzazione"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associazioni"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Autoassociazione"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Proprietà associazione"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Messaggio di collaborazione"
+#: 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 "Impostazioni generali"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Messaggio di sequenza"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Ruoli"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Automessaggio di collaborazione"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Impostazioni ruoli"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Automessaggio di sequenza"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Carattere associazione"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizzazione"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Proprietà ruolo A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Associazione Uni"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Proprietà ruolo B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Esporta"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Visibilità ruolo A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagramma"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Visibilità ruolo B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nuovo"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Cambiabilità del Ruolo A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "M&ostra"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Cambiabilità del Ruolo B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Codice"
+msgid "Rolename:"
+msgstr "Nome ruolo:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Linguaggio attivo"
+msgid "Multiplicity:"
+msgstr "Molteplicità:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentazione"
+msgid "Public"
+msgstr "Pubblico"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Barra-barra (//)"
+msgid "Private"
+msgstr "Privato"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Barra-asterisco (/**  */)"
+msgid "Protected"
+msgstr "Protetto"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stile:"
+msgid "Implementation"
+msgstr "Implementazione"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Generazione codice C++</p>"
+msgid "Changeable"
+msgstr "Cambiabilità"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Generale"
+msgid "Frozen"
+msgstr "Bloccato"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Metodo di generazione del corpo"
+msgid "Add only"
+msgstr "Aggiungi solo"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Usa le seguenti per le classi nel codice generato:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nome classe:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nome attore:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vettore"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nome pacchetto:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variabile</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nome dei casi d'uso:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nome interfaccia:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nome componente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "stringa"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nome manufatto:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Stringa</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Nome enumerazione:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nome del tipo di dato:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nome dell'entità:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globale?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Nome &stereotipo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Nome &pacchetto:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nome classe"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Classe as&tratta"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">File di include</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Caso d'uso as&tratto"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generazione progetto"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Eseguibile"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Crea documento di compilazione per ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Disegna come"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Autogenera i metodi"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Predefinito"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Svuota i metodi dei costruttori"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Riempi:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Metodi di associazione delle funzioni di accesso"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Libreria"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Metodi degli attributi delle funzioni di accesso"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabella"
 
-#. 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 "Pubblico"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibilità"
 
-#. 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 "Privato"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ubblica"
 
-#. 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 "Protetto"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivata"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Dall'oggetto genitore"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tetto"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Ambito predefinito delle funzioni d'accesso degli attributi:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentazione"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Ambito predefinito dei campi di associazione:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nome classe:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Dal ruolo del genitore"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nome istanza:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generazione codice Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Disegna come attore"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Cancelletto (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Istanza multipla"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Inizio-fine (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Mostra distruzione"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generazione codice Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nome componente:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nome nodo:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nome stereotipo:"
+
+#: 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 ""
+"Il nome scelto è già usato.\n"
+"Il nome è stato annullato."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Nome non univoco"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attributi"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&uovo attributo..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operazioni"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nuova op&erazione..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Modelli"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Nuovo mod&ello..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enumerazione letterale"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&uova enumerazione letterale..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Attributi dell'entità"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Nuovo attributo dell'&entità..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Elimina àncora"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Proprietà"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Mostra"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operazio&ni"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibilità"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Firma delle o&perazioni"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pac&chetto"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributi"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereo&tipo"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Firma degli attr&ibuti"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Disegna come cerchio"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Visualizzazione"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opzioni di visualizzazione"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Impostazioni degli attributi"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Impostazioni delle operazioni"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Impostazioni dei modelli"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Impostazioni dell'enumerazione letterale"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Impostazioni degli attributi dell'entità"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Contenimento"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Impostazioni dei contenuti"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Associazioni di classi"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nuova_classe"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nuova classe"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Attributi della classe"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operazioni della classe"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Opzioni per la generazione del codice"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Linguaggio"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generazione"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Cartelle"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Fine"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Scrivi tutti i file generati nella cartella:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Codice generato"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Sfoglia..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Non generato"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "S&foglia..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Non ancora generato"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Includi i file di intestazione dalla cartella:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "La cartella %1 non esiste. Vuoi crearla adesso?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"I file generati dal generatore di codice saranno scritti in questa cartella"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "La cartella di output non esiste"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Crea cartella"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Non creare"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"I file in questa cartella saranno usati come file di intestazione nel codice "
-"generato"
+"La cartella non ha potuto essere creata.\n"
+"Assicurati di avere il permesso di scrittura nella cartella madre o "
+"seleziona una cartella valida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Politica di sovrascrittura"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Errore nella creazione della cartella"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Seleziona una cartella valida."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Se un file con lo stesso nome di quello che il\n"
-"generatore di codice vuole usare per l'output esiste già:"
+"La cartella di output esiste, ma non è scrivibile.\n"
+"Imposta i permessi appropriati o scegli un'altra cartella."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "So&vrascrivi"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Errore nella scrittura sulla cartella di output"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr ""
-"Sovrascrivi i file esistenti se esistono nella cartella di destinazione"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 non sembra essere una cartella. Scegli una cartella valida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Chie&di"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Scegli una cartella valida"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Se un file con lo stesso nome esiste già, chiedi cosa fare"
+msgid "Code Viewer"
+msgstr "Visualizzatore del codice"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Usa un nome diverso"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nessuna opzione disponibile.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Se un file esiste già nella cartella di destinazione, seleziona un nome diverso "
-"da usare aggiungendo un suffisso al nome file"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formattazione"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Righe"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Diagramma &attuale"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Stile per terminare le righe:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Tutti i diagrammi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Tipo di indentazione:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Seleziona diagrammi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Quantità di indentazione:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tipo di diagramma"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selezione"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Casi d'uso"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Collaborazione"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Nessuna indentazione"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sequenza"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulatore"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stato"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Spazio"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Componente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Estensione dei commenti"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Dispiegamento"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Diagramma kde-uml"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Nessun diagramma selezionato."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Il formato in cui saranno esportate le immagini"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Documentazione delle note"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Il file di destinazione esiste già"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Scrivi commenti per le &sezioni\n"
-"anche se la sezione è vuota"
+"Il file %1 esiste già in %2.\n"
+"\n"
+"Umbrello può sovrascrivere il file, generarne uno con\n"
+"un nome simile o non generarlo affatto."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Applica a tutti i file rimanenti"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Sovrascrivi"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Genera un nome file simile"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Non generare nessun file"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Proprietà del parametro"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipo:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nome:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Valore &iniziale:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Direzione di passaggio"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Scrive commenti per indicare le diverse sezioni (pubbliche, private, ecc.) in "
-"una classe, anche se le sezioni sono vuote"
+"\"in\" è un parametro di sola lettura, \"out\" è un parametro di sola "
+"scrittura e \"inout\" è un parametro di lettura e scrittura."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Scrivi commenti di documentazione anche se vuoto"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Elementi contenuti"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Scrivi commenti &per la documentazione delle classi e dei metodi anche se sono "
-"vuoti"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Seleziona operazione"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Opzioni di linguaggio"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Numero sequenza:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Assistente di generazione di codice"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operazione di classe:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Seleziona classi"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Operazione personalizzata:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Configurazione di Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interfaccia utente"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Impostazioni per l'interfaccia utente"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Colore linea:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Colore pr&edefinito"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Colore di riempimento:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Colore pr&edefinito"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Larghezza della linea:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Larghezza pr&edefinita"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Usa colore di riempimento"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Posiziona tutte le classi per le quali vuoi generare il codice\n"
-"nell'elenco sulla destra"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Aggiungi classe per la generazione del codice"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "A&bilita annullamento delle modifiche"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Classi selezionate"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Usa diagrammi a scheda"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Rimuovi classe dal generatore di codice"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Usa i nuovi generatori C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Classi disponibili"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Usa linee di associazione angolari"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Stato della generazione del codice"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Salvataggio automatico"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Premi il pulsante Generazione per avviare la generazione del codice"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "A&bilita salvataggio automatico"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Stato della generazione"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Seleziona l'intervallo per il salvataggio automatico (minuti):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Visualizzatore del codice"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Imposta il suffisso per il salvataggio automatico:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Mostra i blocchi nascosti"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Il file di salvataggio automatico sarà salvato in ~/autosave.xmi se "
+"il salvataggio automatico avviene prima di aver salvato il file manualmente."
+"</p><p>Se l'hai già salvato, il file di salvataggio automatico sarà salvato "
+"nella stessa cartella del file e avrà il suo stesso nome, seguito dal "
+"suffisso specificato.</p><p>Se il suffisso è uguale al suffisso del file che "
+"hai salvato, il salvataggio automatico sovrascriverà automaticamente il file."
+"</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">nome componente qui</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Avvio"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Mostra tipo di blocco"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Lo&go di avvio"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Colori"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Suggerimento del giorno"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Tipo di carattere:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Carica l'ultimo progetto"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Carta:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Avvia nuovo progetto con:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Selezionato:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Nessun diagramma"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Blocco oggetto UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagramma delle classi"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Blocco nascosto:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagramma dei casi d'uso"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Testo non modificabile:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagramma di sequenza"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Testo modificabile:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagramma di collaborazione"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Proprietà diagramma"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagramma di stato"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nome:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagramma di attività"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Ingrandimento:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagramma dei componenti"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagramma di dispiegamento"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Impostazioni classe"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Mostra &visibilità"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Mostra attributi"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Mostra operazioni"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Mostra stereoti&pi"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Mostra la firma dell'attributo"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Mostra pacchetto"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Mostra la firma operazione"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Mostra &griglia"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Ambito di partenza"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Allinea alla &griglia"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Ambito predefinito degli attributi:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Allinea dimensione componente"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Ambito predefinito delle operazioni:"
 
-#. 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."
-msgstr ""
-"Ridimensiona i componenti per essere multipli della spaziatura di griglia.\n"
-"Se \"Allinea alla griglia\" è abilitato, un componente sarà sempre allineato "
-"con la griglia sui 4 lati."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generazione del codice"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Spaziatura griglia:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Impostazioni per la generazione del codice"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Impostazioni per la visualizzazione del codice"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Stato iniziale"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Larghezza di linea:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Fine stato"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Esporta tutte le viste"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tipo stato:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "Cartella in cui salvare i &diagrammi:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nome stato:"
 
-#. 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"
-msgstr "La cartella di base usata per salvare le immagini"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Colore dell'oggetto"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Tipo di &immagine:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Proprietà degli attributi"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Il formato in cui saranno esportate le immagini"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Ambit&o del classificatore (\"statico\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Usa &cartelle"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Pubblico"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Crea nella cartella di destinazione la stessa struttura ad albero\n"
-"usata nel documento per salvare le viste"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&etta"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementazione"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Hai inserito un nome di attributo non valido."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nome di attributo non valido"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Le viste sono salvate nelle cartelle del documento. La stessa struttura ad "
-"albero usata nel documento per salvare le viste può essere creata nella "
-"cartella di base selezionata con questa opzione.\n"
-"Solo le cartelle fatte dall'utente sono create nella cartella di base (la vista "
-"logica, la vista di caso d'uso e così via non sono create)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Il nome attributo scelto è già stato usato in questa operazione."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Proprietà ruolo"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Nome di attributo non univoco"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Nome ruolo:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Proprietà degli attributi dell'entità"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Molteplicità:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Valore pre&definito:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Cambiabilità del ruolo"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Lunghezza/valori:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Aggiungi solo"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Autoincremento"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Bloccato"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Permetti &nullo"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Cambiabilità"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributi:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Visibilità ruolo"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indicizzazione"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementazione"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Nessuna"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Benvenuto a Umbrello.</p>\n"
-"<p>I diagrammi UML ti permettono di progettare e documentare del software "
-"orientato a oggetti. <a href=\"help:/umbrello\">Il manuale di Umbrello</a> "
-"è una buona introduzione all'uso di UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primaria"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Benvenuto a Umbrello 1.5. Di nuovo, in questa versione, ci sono le classi "
-"associative, la generazione di codice Ruby, le cartelle esternalizzate, la "
-"capacità di cambiare le interfacce in classi, e altro.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indice"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>I diagrammi a scheda e le cartelle esternalizzate sono mutualmente "
-"esclusivi. Se ti servono le cartelle esterne, deseleziona &quot;Usa diagrammi a "
-"scheda&quot; nelle Impostazioni generali.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Univoco"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p> La maggior parte degli elementi dei diagrammi non possono essere "
-"ridimensionati, e si ridimensioneranno da soli per adattarsi al loro "
-"contenuto.\n"
-"I riquadri, le note e i messaggi dei diagrammi di sequenza possono essere "
-"ridimensionati facendo clic e trascinando il quadrato rosso.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Hai inserito un nome di attributo dell'entità non valido."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Se vuoi aggiungere una classe già esistente a un diagramma, trascinane la "
-"sua voce dalla vista ad albero.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nome di attributo dell'entità non valido"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Il nuovo agente di rifattorizzazione di Umbrello ti permette di spostare\n"
-"le operazioni tra una classe e le sue classi derivate e di base.\n"
-"Fai clic con il tasto destro su una classe per aprire l'agente di "
-"rifattorizzazione.</p>\n"
+"Il nome dell'attributo dell'entità scelto è già stato usato in questa "
+"operazione."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Gli oggetti dei diagrammi di sequenza possono avere un riquadro di "
-"distruzione e possono essere disegnati come attori.\n"
-"Fai doppio clic per la finestra di dialogo delle proprietà.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Nome di attributo dell'entità non univoco"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>I messaggi dei diagrammi di sequenza possono fare da costruttori. Fai clic "
-"sul riquadro dell'oggetto (piuttosto che la linea verticale) per renderlo un "
-"costruttore.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Proprietà operazione"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>I diagrammi di sequenza supportano i messaggi a se stessi. Rifai clic sulla "
-"stessa linea verticale per creare un automessaggio.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Operazione &astratta"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Se al caricamento di un file esterno non viene visualizzano nulla nella "
-"vista a elenco, prova a salvare il modello con un nome diverso,\n"
-"chiudere, e ricaricare il file salvato. Normalmente la vista a elenco è "
-"ripopolata correttamente.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Interrogazione (\"costante\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Taglia e copia provvedono anche a esportare l'immagine come PNG negli "
-"appunti che può essere incollata in KWord\n"
-"e in altre applicazioni.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametri"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Le associazioni non hanno bisogno di essere linee rette, farci doppio clic "
-"creerà un punto mobile.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "&Nuovo parametro..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Puoi abilitare il salvataggio automatico nella finestra Configura "
-"Umbrello.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Hai inserito un nome di parametro non valido."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>C'è una caratteristica mancante che ti serve in Umbrello? Per piacere, facci "
-"sapere.\n"
-"Aggiungila alla banca dati dei bug tramite una segnalazione dal menu Aiuto o\n"
-"scrivici sulla mailing list uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nome del parametro non valido"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Puoi eliminare tutti gli oggetti selezionati premendo il tasto Canc o "
-"Backspace.</p>\n"
+"Il nome del parametro scelto è\n"
+"già usato in questa operazione."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Se hai trovato un bug in Umbrello, per piacere facci sapere.\n"
-"Puoi inviare bug tramite lo strumento di Rapporto Bug nel menu Aiuto.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Nome del parametro non univoco"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Premendo il tasto Esc è possibile impostare lo strumento attuale allo "
-"strumento di selezione.\n"
-"Il tasto Backspace va allo strumento usato precedentemente.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Il nome del parametro scelto è già stato usato in questa operazione."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Hai inserito un nome di operazione non valido."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nome di operazione non valido"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Un'operazione con questa firma esiste già in %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Scegli un nome diverso o un elenco di parametri."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Proprietà ruolo"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Proprietà modello"
 
-#: tips.txt:103
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Hai inserito un nome di modello non valido."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nome di modello non valido"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Puoi selezionare tutti gli oggetti premendo Ctrl-A.</p>\n"
+"Il nome del parametro del modello che hai scelto è già in uso in questa "
+"operazione."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Nome del modello non univoco"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opzioni visualizzazione classi"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Colori del diagramma"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Il nome inserito non è valido."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Il nome inserito non è univoco."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nome non univoco"
 
-#: tips.txt:108
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linea:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Riempi:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Pr&edefinito"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Usa riempimento"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Esportazione di tutte le viste..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Si sono verificati degli errori nell'esportazione delle immagini:"
+
+#: 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 "C'è stato un problema salvando il file: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Errore di salvataggio"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Generatore di codice autonomo del modellatore UML Umbrello"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "File da trasformare"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Il file XSLT da usare"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Puoi creare e impostare una nuova classe utilizzando l'assistente per la "
-"nuova classe nel menu Codice.</p>\n"
+"(c) 2006 di Gael de Chalendar (detto Kleag), (c) 2002-2006 degli autori del "
+"modellatore UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autori del modellatore UML Umbrello"
+
+#: 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 "Nome"
+
+#: 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 "Inserisci nome:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Inserisci il nome dell'operazione:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Inserisci nuovo testo:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERRORE"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Cambia testo"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Il file %1 non esiste."
+
+#: 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 "Errore di caricamento"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Il file %1 non può essere aperto."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1702,6 +1822,10 @@ msgstr "Nuova operazione..."
 msgid "Select Operation..."
 msgstr "Scegli operazione..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Cambia testo..."
@@ -1753,6 +1877,19 @@ msgstr "Nuovo"
 msgid "Rename..."
 msgstr "Rinomina..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Errore di incollamento"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Colore linea..."
@@ -1781,14 +1918,26 @@ msgstr "Internalizza cartella"
 msgid "Import Classes..."
 msgstr "Importa classi..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pacchetto"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Sottosistema"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Manufatto"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagramma dei componenti..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nodo"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagramma di dispiegamento..."
@@ -1797,10 +1946,18 @@ msgstr "Diagramma di dispiegamento..."
 msgid "Folder"
 msgstr "Cartella"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entità"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagramma di relazione tra entità..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Attore"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagramma dei casi d'uso..."
@@ -1837,6 +1994,18 @@ msgstr "Nuovo attributo dell'entità..."
 msgid "Export as Picture..."
 msgstr "Esporta come immagine..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfaccia"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tipo di dati"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumerazione"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagramma delle classi..."
@@ -1857,26 +2026,10 @@ msgstr "Diagramma di sequenza..."
 msgid "Collaboration Diagram..."
 msgstr "Diagramma di collaborazione..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attributi"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operazioni"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Solo pubblico"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibilità"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Firma operazione"
@@ -1889,11 +2042,6 @@ msgstr "Firma attributo"
 msgid "Stereotype"
 msgstr "Stereotipo"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Mostra"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attributo..."
@@ -1918,14 +2066,6 @@ msgstr "Colore di riempimento..."
 msgid "Use Fill Color"
 msgstr "Usa colore di riempimento"
 
-#: 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 "Colore"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Attore..."
@@ -1954,10 +2094,26 @@ msgstr "Enumerazione..."
 msgid "Package..."
 msgstr "Pacchetto..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Stato iniziale"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Stato finale"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stato..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Attività iniziale"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Attività finale"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Sottosistema..."
@@ -2002,6 +2158,14 @@ msgstr "Elimina àncora"
 msgid "Change Association Name..."
 msgstr "Cambia nome dell'associazione..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Pulisci diagramma"
@@ -2036,11 +2200,11 @@ msgstr "la cartella del file"
 
 #: 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 ""
-"mantieni la struttura ad albero usata per salvare le viste del documento nella "
-"cartella di destinazione"
+"mantieni la struttura ad albero usata per salvare le viste del documento "
+"nella cartella di destinazione"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
@@ -2048,191 +2212,96 @@ msgstr ""
 "(c) 2001 di Paul Hensgen, (c) 2002-2006 degli autori del modellatore UML "
 "Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Uso errato delle associazioni."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Errore di associazione"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Il file %1 non esiste."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Il file %1 non può essere aperto."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Federico Zenith,Daniele Medri"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "federico.zenith@member.fsf.org"
-
-#: 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 "Pronto."
-
-#: 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 ""
-"Tieni premuto Shift o Ctrl per spostarti sull'asse X. Tieni premuto Shift e "
-"Ctrl per spostarti nell'asse Y. Fai clic con il pulsante destro per annullare "
-"lo spostamento."
-
-#: 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 ""
-"Tieni premuto Shift o Ctrl per spostarti sull'asse X. Tieni premuto Shift e "
-"Ctrl per spostarti nell'asse Y. Fai clic con il pulsante destro per annullare "
-"il ridimensionamento."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "L'ambito %1 è un namespace o una classe?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "L'importazione C++ richiede il tuo aiuto"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Namespace"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importazione del file: %1 Avanzamento: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Errore interno"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Errore di sintassi prima di '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Errore di analisi prima di '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<finefile>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nuovo_attore"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "attesa espressione"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nuovo_casouso"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Errore di sintassi della dichiarazione"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nuovo_pacchetto"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} atteso"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nuovo_componente"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace atteso"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nuovo_nodo"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ atteso"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nuovo_manufatto"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Nome del namespace atteso"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nuova_interfaccia"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Devi dichiarare uno specificatore di tipo"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nuovo_tipodati"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "dichiarazione attesa"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nuova_enumerazione"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "espressione costante attesa"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nuova_entità"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' atteso"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nuova_cartella"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} mancante"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nuova_associazione"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Inizializzatori membri attesi"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nuovo_oggetto"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Specificatore della classe base atteso"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Istruzioni di inizializzazione attese"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Vuoto"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identificatore atteso"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argomento mal posto"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "ID del tipo attesa"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tipo di argomento sconosciuto"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Nome della classe atteso"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nome del metodo non consentito"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "condizione attesa"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tipo restituito sconosciuto"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "affermazione attesa"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Errore non specificato"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "inizializzazione di for attesa"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Questa è una parola chiave riservata al linguaggio del generatore di codice "
+"configurato."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch attesa"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Parola chiave riservata"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2246,107 +2315,66 @@ msgstr "Inserisci il nome dell'oggetto:"
 msgid "new_parameter"
 msgstr "nuovo_parametro"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Impostazioni generali"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Il pacchetto è un namespace"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Distruttori virtuali"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Genera costruttori vuoti"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Genera metodi delle funzioni d'accesso"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Le operazioni sono in linea"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Le funzioni d'accesso sono in linea"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Le funzioni d'accesso sono pubbliche"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagramma: %2 Pagina %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Inserisci il nome del diagramma"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Aggiungi classe base"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Inserisci il nuovo nome del diagramma:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Aggiungi classe derivata"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Stai per eliminare l'intero diagramma.\n"
-"Sei sicuro?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Aggiungi operazione"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Elimina il diagramma?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Aggiungi attributo"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Rinomina annullata"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Aggiungi interfaccia base"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"La rinomina di un elemento della vista a elenco di tipo %1 non è ancora "
-"implementata."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Aggiungi interfaccia derivata"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funzione non implementata"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Classificatori base"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Il nome inserito non era valido.\n"
-"Il processo di rinomina è stato annullato."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Classificatori derivati"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nuova_associazione"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Inserisci il nome dello stato"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nuovo_attributo"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Inserisci il nome del nuovo stato:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nuovo_modello"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Inserisci attività"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nuova_operazione"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Uso errato delle associazioni."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nuovo_letterale"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Errore di associazione"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nuovo_campo"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nuovo stato"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2500,11 +2528,6 @@ msgstr "&Esporta come immagine..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Esport&a tutti i diagrammi come immagini..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Proprietà"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Regola ingrandimento"
@@ -2589,21 +2612,28 @@ msgstr "&Documentazione"
 msgid "Opening file..."
 msgstr "Apertura file..."
 
+#: 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 "Creazione nuovo documento..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Tutti i file supportati (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Tutti i file supportati (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|File XMI non compressi (*.xmi)\n"
 "*.xmi.tgz|File XMI compressi con Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|File XMI compressi con Bzip2 (*.xmi.tar.bz2)\n"
@@ -2633,6 +2663,10 @@ msgstr ""
 "*.xmi.tar.bz2|File XMI compresso con Bzip2\n"
 "*|Tutti i file"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2641,6 +2675,10 @@ msgstr ""
 "Il file %1 esiste.\n"
 "Vuoi sovrascriverlo?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Sovrascrivi"
@@ -2676,11 +2714,11 @@ msgstr "Inserimento del contenuto degli appunti..."
 
 #: 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 ""
-"Umbrello non ha potuto incollare il contenuto degli appunti. Gli oggetti negli "
-"appunti potrebbero essere del tipo sbagliato da incollare qui."
+"Umbrello non ha potuto incollare il contenuto degli appunti. Gli oggetti "
+"negli appunti potrebbero essere del tipo sbagliato da incollare qui."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2735,1265 +2773,1326 @@ msgstr "Tutti i file"
 msgid "Select Code to Import"
 msgstr "Seleziona il codice da importare"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nome classe:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nome attore:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nuovo_attributo"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nome pacchetto:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nuovo_modello"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nome dei casi d'uso:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nuova_operazione"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nome interfaccia:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nuovo_letterale"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nome componente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nuovo_campo"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nome manufatto:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Modello UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Nome enumerazione:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Vista logica"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nome del tipo di dato:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Vista dei casi d'uso"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nome dell'entità:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Vista componenti"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Nome &stereotipo:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Vista di dispiegamento"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Nome &pacchetto:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Modello di relazioni tra entità"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Classe as&tratta"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipi di dati"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Caso d'uso as&tratto"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Il file corrente è stato modificato.\n"
+"Vuoi salvarlo?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Eseguibile"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Il file %1 non esiste."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Disegna come"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Il file %1 sembra essere difettoso."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Predefinito"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Non è stato trovato nessun file XMI nel file compresso %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Libreria"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "C'è stato un problema caricando il file estratto: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabella"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "C'è stato un problema caricando il file: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ubblica"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "C'è stato un problema durante l'invio del file: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivata"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagramma dei casi d'uso"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tetto"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagramma delle classi"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentazione"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagramma di sequenza"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nome classe:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagramma di collaborazione"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nome istanza:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagramma di stato"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Disegna come attore"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagramma di attività"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Istanza multipla"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagramma dei componenti"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Mostra distruzione"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagramma di dispiegamento"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nome componente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagramma di relazioni tra entità"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nome nodo:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Questo è un nome non valido per un diagramma."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nome stereotipo:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Un diagramma sta già usando questo nome."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Il nome scelto è già usato.\n"
-"Il nome è stato annullato."
+"Il nome inserito non era univoco.\n"
+"È quello che volevi?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Nome non univoco"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Usa nome"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linea:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Inserisci il nuovo nome"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Riempi:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Sei sicuro di voler eliminare il diagramma %1?"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Pr&edefinito"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Elimina diagramma"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Usa riempimento"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Impostazione del documento..."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Attività"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Risoluzione delle referenze degli oggetti..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nuova attività..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Caricamento elementi UML..."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Rinomina"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Caricamento diagrammi..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nuova attività"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Rinomina attività"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Esternalizza cartella"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Inserisci il nuovo nome dell'attività:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Inserisci il nome del modello"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Proprietà associazione"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Inserisci il nuovo nome del modello:"
 
-#: 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 "Impostazioni generali"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Viste"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Ruoli"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Il nome inserito non era valido.\n"
+"Il processo di creazione è stato annullato."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Impostazioni ruoli"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nome non valido"
 
-#: 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 "Impostazioni caratteri"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Il nome inserito non era univoco!\n"
+"Il processo di creazione è stato annullato."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Carattere associazione"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Creazione annullata"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Proprietà modello"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Caricamento vista a elenco..."
 
-#: 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 "Proprietà generali"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "La cartella deve essere svuotata prima di essere eliminata."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipo:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Cartella non vuota"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nome:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Rinomina annullata"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Hai inserito un nome di modello non valido."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"La rinomina di un elemento della vista a elenco di tipo %1 non è ancora "
+"implementata."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nome di modello non valido"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funzione non implementata"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Il nome del parametro del modello che hai scelto è già in uso in questa "
-"operazione."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Nome del modello non univoco"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Proprietà degli attributi dell'entità"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Valore pre&definito:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Lunghezza/valori:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Autoincremento"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Permetti &nullo"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributi:"
+"Il nome inserito non era valido.\n"
+"Il processo di rinomina è stato annullato."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indicizzazione"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagramma: %2 Pagina %1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Nessuna"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Inserisci il nome del diagramma"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primaria"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Inserisci il nuovo nome del diagramma:"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indice"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Stai per eliminare l'intero diagramma.\n"
+"Sei sicuro?"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Univoco"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Elimina il diagramma?"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Hai inserito un nome di attributo dell'entità non valido."
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Esportazione della vista..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nome di attributo dell'entità non valido"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Si è verificato un errore durante l'esportazione dell'immagine:\n"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
-"Il nome dell'attributo dell'entità scelto è già stato usato in questa "
-"operazione."
+"Il file selezionato %1 esiste.\n"
+"Vuoi sovrascriverlo?"
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Nome di attributo dell'entità non univoco"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Il file esiste già"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Visualizzazione"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Impossibile creare la cartella: %1"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opzioni visualizzazione classi"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Impossibile salvare un diagramma vuoto"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Colori del diagramma"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Il nome inserito non è valido."
+#: 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 ""
+"Tieni premuto Shift o Ctrl per spostarti sull'asse X. Tieni premuto Shift e "
+"Ctrl per spostarti nell'asse Y. Fai clic con il pulsante destro per "
+"annullare lo spostamento."
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Il nome inserito non è univoco."
+#: 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 ""
+"Tieni premuto Shift o Ctrl per spostarti sull'asse X. Tieni premuto Shift e "
+"Ctrl per spostarti nell'asse Y. Fai clic con il pulsante destro per "
+"annullare il ridimensionamento."
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipo:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Oggetto"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Configurazione di Umbrello"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Messaggio sincrono"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interfaccia utente"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Messaggio asincrono"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Impostazioni per l'interfaccia utente"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etichetta"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Colore linea:"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Nota"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Colore pr&edefinito"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Area"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Colore di riempimento:"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relazione"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Colore pr&edefinito"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Associazione direzionale"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Larghezza della linea:"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementa (Generalizzazione/Realizzazione)"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Larghezza pr&edefinita"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Cronologia dettagliata"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Usa colore di riempimento"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Cronologia breve"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "A&bilita annullamento delle modifiche"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Unisci"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Usa diagrammi a scheda"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Separa"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Usa i nuovi generatori C++/Java/Ruby"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Giunto"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Usa linee di associazione angolari"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Scelta"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Salvataggio automatico"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Transizione di attività"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "A&bilita salvataggio automatico"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Messaggio"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Seleziona l'intervallo per il salvataggio automatico (minuti):"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "NON DEFINITO"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Imposta il suffisso per il salvataggio automatico:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Seleziona"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
-"<qt>"
-"<p>Il file di salvataggio automatico sarà salvato in ~/autosave.xmi se il "
-"salvataggio automatico avviene prima di aver salvato il file manualmente.</p>"
-"<p>Se l'hai già salvato, il file di salvataggio automatico sarà salvato nella "
-"stessa cartella del file e avrà il suo stesso nome, seguito dal suffisso "
-"specificato.</p>"
-"<p>Se il suffisso è uguale al suffisso del file che hai salvato, il salvataggio "
-"automatico sovrascriverà automaticamente il file.</p></qt>"
-
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Avvio"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Lo&go di avvio"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Suggerimento del giorno"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Carica l'ultimo progetto"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Avvia nuovo progetto con:"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Nessun diagramma"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagramma delle classi"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagramma dei casi d'uso"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagramma di sequenza"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagramma di collaborazione"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Mostra operazioni"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagramma di stato"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagramma di attività"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Pulisci diagramma"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagramma dei componenti"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagramma di dispiegamento"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalizzazione"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Impostazioni classe"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Mostra &visibilità"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Mostra attributi"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nome dell'associazione"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Mostra operazioni"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Mostra stereoti&pi"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Mostra la firma dell'attributo"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Mostra pacchetto"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Predefinito"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Ambito di partenza"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Ambito predefinito degli attributi:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Barra-barra (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Ambito predefinito delle operazioni:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Barra-asterisco (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generazione del codice"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stile:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Impostazioni per la generazione del codice"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Generazione codice C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Impostazioni per la visualizzazione del codice"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Metodo di generazione del corpo"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Proprietà operazione"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Usa le seguenti per le classi nel codice generato:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Operazione &astratta"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Ambit&o del classificatore (\"statico\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vettore"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Interrogazione (\"costante\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variabile</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&etta"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementazione"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametri"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "stringa"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Nuovo parametro..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Stringa</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Hai inserito un nome di parametro non valido."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nome del parametro non valido"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Il nome del parametro scelto è\n"
-"già usato in questa operazione."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globale?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Nome del parametro non univoco"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Il nome del parametro scelto è già stato usato in questa operazione."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nome classe"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Hai inserito un nome di operazione non valido."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">File di include</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nome di operazione non valido"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generazione progetto"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Un'operazione con questa firma esiste già in %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Crea documento di compilazione per ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Scegli un nome diverso o un elenco di parametri."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Autogenera i metodi"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Proprietà ruolo A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Svuota i metodi dei costruttori"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Proprietà ruolo B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Metodi di associazione delle funzioni di accesso"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Visibilità ruolo A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Metodi degli attributi delle funzioni di accesso"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Visibilità ruolo B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Dall'oggetto genitore"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Cambiabilità del Ruolo A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Ambito predefinito delle funzioni d'accesso degli attributi:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Cambiabilità del Ruolo B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Ambito predefinito dei campi di associazione:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Elementi contenuti"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Dal ruolo del genitore"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Documentazione delle note"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generazione codice Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&uovo attributo..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Cancelletto (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nuova op&erazione..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Inizio-fine (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Modelli"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generazione codice Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Nuovo mod&ello..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Linguaggio"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enumerazione letterale"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Cartelle"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&uova enumerazione letterale..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Scrivi tutti i file generati nella cartella:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Attributi dell'entità"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Sfoglia..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Nuovo attributo dell'&entità..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "S&foglia..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Attività iniziale"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Includi i file di intestazione dalla cartella:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Fine attività"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"I file generati dal generatore di codice saranno scritti in questa cartella"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tipo attività:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"I file in questa cartella saranno usati come file di intestazione nel codice "
+"generato"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nome attività:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Politica di sovrascrittura"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Colori degli oggetti"
+#: 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 ""
+"Se un file con lo stesso nome di quello che il\n"
+"generatore di codice vuole usare per l'output esiste già:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Proprietà degli attributi"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "So&vrascrivi"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Valore &iniziale:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
+"Sovrascrivi i file esistenti se esistono nella cartella di destinazione"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Pubblico"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Chie&di"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Hai inserito un nome di attributo non valido."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Se un file con lo stesso nome esiste già, chiedi cosa fare"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nome di attributo non valido"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Usa un nome diverso"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Il nome attributo scelto è già stato usato in questa operazione."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Se un file esiste già nella cartella di destinazione, seleziona un nome "
+"diverso da usare aggiungendo un suffisso al nome file"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Nome di attributo non univoco"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formattazione"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Seleziona operazione"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Righe"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Numero sequenza:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Stile per terminare le righe:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operazione di classe:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Tipo di indentazione:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Operazione personalizzata:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Quantità di indentazione:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammi"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtro"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Diagramma &attuale"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Tutti i diagrammi"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Nessuna indentazione"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Seleziona diagrammi"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulatore"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tipo di diagramma"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Spazio"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selezione"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Estensione dei commenti"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Collaborazione"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Scrivi commenti per le &sezioni\n"
+"anche se la sezione è vuota"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sequenza"
+#: 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 ""
+"Scrive commenti per indicare le diverse sezioni (pubbliche, private, ecc.) "
+"in una classe, anche se le sezioni sono vuote"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Dispiegamento"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Scrivi commenti di documentazione anche se vuoto"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Nessun diagramma selezionato."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Scrivi commenti &per la documentazione delle classi e dei metodi anche se "
+"sono vuoti"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opzioni di visualizzazione"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Opzioni di linguaggio"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Impostazioni degli attributi"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Assistente di generazione di codice"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Impostazioni delle operazioni"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Seleziona classi"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Impostazioni dei modelli"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Posiziona tutte le classi per le quali vuoi generare il codice\n"
+"nell'elenco sulla destra"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Impostazioni dell'enumerazione letterale"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Aggiungi classe per la generazione del codice"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Impostazioni degli attributi dell'entità"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Classi selezionate"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Impostazioni dei contenuti"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Rimuovi classe dal generatore di codice"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associazioni"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Classi disponibili"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Associazioni di classi"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Stato della generazione del codice"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operazio&ni"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Premi il pulsante Generazione per avviare la generazione del codice"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibilità"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Stato della generazione"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Firma delle o&perazioni"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Mostra i blocchi nascosti"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pac&chetto"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">nome componente qui</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributi"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereo&tipo"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Mostra tipo di blocco"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Firma degli attr&ibuti"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Colori"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Disegna come cerchio"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Tipo di carattere:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Stato iniziale"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Carta:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Fine stato"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Selezionato:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tipo stato:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Blocco oggetto UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nome stato:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Blocco nascosto:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Colore dell'oggetto"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Testo non modificabile:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nuova_classe"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Testo modificabile:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nuova classe"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Proprietà diagramma"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Attributi della classe"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Ingrandimento:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operazioni della classe"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Proprietà del parametro"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Mostra &griglia"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Direzione di passaggio"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Allinea alla &griglia"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Allinea dimensione componente"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" è un parametro di sola lettura, \"out\" è un parametro di sola scrittura "
-"e \"inout\" è un parametro di lettura e scrittura."
+"Ridimensiona i componenti per essere multipli della spaziatura di griglia.\n"
+"Se \"Allinea alla griglia\" è abilitato, un componente sarà sempre allineato "
+"con la griglia sui 4 lati."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generazione"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Spaziatura griglia:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Fine"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Codice generato"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Non generato"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Larghezza di linea:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Non ancora generato"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Esporta tutte le viste"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "La cartella %1 non esiste. Vuoi crearla adesso?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "Cartella in cui salvare i &diagrammi:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "La cartella di output non esiste"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "La cartella di base usata per salvare le immagini"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Crea cartella"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Tipo di &immagine:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Non creare"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Usa &cartelle"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"La cartella non ha potuto essere creata.\n"
-"Assicurati di avere il permesso di scrittura nella cartella madre o seleziona "
-"una cartella valida."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Errore nella creazione della cartella"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Seleziona una cartella valida."
+"Crea nella cartella di destinazione la stessa struttura ad albero\n"
+"usata nel documento per salvare le viste"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"La cartella di output esiste, ma non è scrivibile.\n"
-"Imposta i permessi appropriati o scegli un'altra cartella."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Errore nella scrittura sulla cartella di output"
+"Le viste sono salvate nelle cartelle del documento. La stessa struttura ad "
+"albero usata nel documento per salvare le viste può essere creata nella "
+"cartella di base selezionata con questa opzione.\n"
+"Solo le cartelle fatte dall'utente sono create nella cartella di base (la "
+"vista logica, la vista di caso d'uso e così via non sono create)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 non sembra essere una cartella. Scegli una cartella valida."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Cambiabilità del ruolo"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Scegli una cartella valida"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Visibilità ruolo"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Il file di destinazione esiste già"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Esporta"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Il file %1 esiste già in %2.\n"
-"\n"
-"Umbrello può sovrascrivere il file, generarne uno con\n"
-"un nome simile o non generarlo affatto."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Applica a tutti i file rimanenti"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Sovrascrivi"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Genera un nome file simile"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Non generare nessun file"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nessuna opzione disponibile.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Molteplicità"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Inserisci la molteplicità:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nome dell'associazione"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Inserisci il nome dell'associazione:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nome del ruolo"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Inserisci il nome del ruolo:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Inserisci il nome dell'operazione:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Inserisci nuovo testo:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERRORE"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Cambia testo"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Allinea a sinistra"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Allinea a destra"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagramma"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Allinea in alto"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nuovo"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Allinea in basso"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "M&ostra"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Allinea verticalmente al centro"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Ingrandimento:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Allinea orizzontalmente al centro"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Codice"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Allinea verticalmente distribuito"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Linguaggio attivo"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Allinea orizzontalmente distribuito"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Per l'allineamento devi selezionare almeno due oggetti come classi o attori. "
-"Non puoi allineare associazioni."
+"<p>Benvenuto a Umbrello.</p>\n"
+"<p>I diagrammi UML ti permettono di progettare e documentare del software "
+"orientato a oggetti. <a href=\"help:/umbrello\">Il manuale di Umbrello</a> è "
+"una buona introduzione all'uso di UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Questa è una parola chiave riservata al linguaggio del generatore di codice "
-"configurato."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Parola chiave riservata"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Esportazione della vista..."
+"<p>Benvenuto a Umbrello 1.5. Di nuovo, in questa versione, ci sono le classi "
+"associative, la generazione di codice Ruby, le cartelle esternalizzate, la "
+"capacità di cambiare le interfacce in classi, e altro.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Si è verificato un errore durante l'esportazione dell'immagine:\n"
+"<p>I diagrammi a scheda e le cartelle esternalizzate sono mutualmente "
+"esclusivi. Se ti servono le cartelle esterne, deseleziona &quot;Usa "
+"diagrammi a scheda&quot; nelle Impostazioni generali.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Il file selezionato %1 esiste.\n"
-"Vuoi sovrascriverlo?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Il file esiste già"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nuovo_attore"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nuovo_casouso"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nuovo_pacchetto"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nuovo_componente"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nuovo_nodo"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nuovo_manufatto"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nuova_interfaccia"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nuovo_tipodati"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nuova_enumerazione"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nuova_entità"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nuova_cartella"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nuovo_oggetto"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Vuoto"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argomento mal posto"
+"<p> La maggior parte degli elementi dei diagrammi non possono essere "
+"ridimensionati, e si ridimensioneranno da soli per adattarsi al loro "
+"contenuto.\n"
+"I riquadri, le note e i messaggi dei diagrammi di sequenza possono essere "
+"ridimensionati facendo clic e trascinando il quadrato rosso.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tipo di argomento sconosciuto"
+#: 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 ""
+"<p>Se vuoi aggiungere una classe già esistente a un diagramma, trascinane la "
+"sua voce dalla vista ad albero.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nome del metodo non consentito"
+#: 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 ""
+"<p>Il nuovo agente di rifattorizzazione di Umbrello ti permette di spostare\n"
+"le operazioni tra una classe e le sue classi derivate e di base.\n"
+"Fai clic con il tasto destro su una classe per aprire l'agente di "
+"rifattorizzazione.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tipo restituito sconosciuto"
+#: 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 ""
+"<p>Gli oggetti dei diagrammi di sequenza possono avere un riquadro di "
+"distruzione e possono essere disegnati come attori.\n"
+"Fai doppio clic per la finestra di dialogo delle proprietà.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Errore non specificato"
+#: 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 ""
+"<p>I messaggi dei diagrammi di sequenza possono fare da costruttori. Fai "
+"clic sul riquadro dell'oggetto (piuttosto che la linea verticale) per "
+"renderlo un costruttore.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Aggiungi classe base"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>I diagrammi di sequenza supportano i messaggi a se stessi. Rifai clic "
+"sulla stessa linea verticale per creare un automessaggio.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Aggiungi classe derivata"
+#: 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 ""
+"<p>Se al caricamento di un file esterno non viene visualizzano nulla nella "
+"vista a elenco, prova a salvare il modello con un nome diverso,\n"
+"chiudere, e ricaricare il file salvato. Normalmente la vista a elenco è "
+"ripopolata correttamente.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Aggiungi operazione"
+#: 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 ""
+"<p>Taglia e copia provvedono anche a esportare l'immagine come PNG negli "
+"appunti che può essere incollata in KWord\n"
+"e in altre applicazioni.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Aggiungi attributo"
+#: 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 ""
+"<p>Le associazioni non hanno bisogno di essere linee rette, farci doppio "
+"clic creerà un punto mobile.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Aggiungi interfaccia base"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Puoi abilitare il salvataggio automatico nella finestra Configura "
+"Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Aggiungi interfaccia derivata"
+#: 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 ""
+"<p>C'è una caratteristica mancante che ti serve in Umbrello? Per piacere, "
+"facci sapere.\n"
+"Aggiungila alla banca dati dei bug tramite una segnalazione dal menu Aiuto "
+"o\n"
+"scrivici sulla mailing list uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Classificatori base"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Puoi eliminare tutti gli oggetti selezionati premendo il tasto Canc o "
+"Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Classificatori derivati"
+#: 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 ""
+"<p>Se hai trovato un bug in Umbrello, per piacere facci sapere.\n"
+"Puoi inviare bug tramite lo strumento di Rapporto Bug nel menu Aiuto.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Impossibile creare la cartella: %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 ""
+"<p>Premendo il tasto Esc è possibile impostare lo strumento attuale allo "
+"strumento di selezione.\n"
+"Il tasto Backspace va allo strumento usato precedentemente.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Impossibile salvare un diagramma vuoto"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Puoi selezionare tutti gli oggetti premendo Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Si è verificato un problema durante il salvataggio del diagramma 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 ""
+"<p>Puoi creare e impostare una nuova classe utilizzando l'assistente per la "
+"nuova classe nel menu Codice.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "nuovo_stereotipo"
@@ -4018,7 +4117,8 @@ msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 #~ "Please select one of the installed languages to generate the code with."
 #~ msgstr ""
 #~ "Non ci sono linguaggi attivi definiti.\n"
-#~ "Per piacere, seleziona uno dei linguaggi installati con cui generare il codice."
+#~ "Per piacere, seleziona uno dei linguaggi installati con cui generare il "
+#~ "codice."
 
 #~ msgid "No Language Selected"
 #~ msgstr "Nessuna linguaggio selezionato"
@@ -4034,7 +4134,8 @@ msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 #~ "Please select one of the installed languages to generate the code with."
 #~ msgstr ""
 #~ "Impossibile trovare un linguaggio attivo.\n"
-#~ "Per piacere seleziona uno dei linguaggi installati con cui generare il codice."
+#~ "Per piacere seleziona uno dei linguaggi installati con cui generare il "
+#~ "codice."
 
 #~ msgid "UMLRolePropertiesBase"
 #~ msgstr "UMLRolePropertiesBase"
@@ -4112,8 +4213,15 @@ msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 #~ msgid "Select Classes to Import"
 #~ msgstr "Seleziona le classi da importare"
 
-#~ msgid "<p>Welcome to Umbrello 1.4.  New in this version are tabbed diagrams, canvas items can be moved with Alt+arrowkeys, a PHP 5 code generator, entity relationship diagrams and many fixes.</p>\n"
-#~ msgstr "<p>Benvenuto a Umbrello 1.4. Di nuovo in questa versione ci sono i diagrammi a schede, gli elementi a tela possono essere spostati con Alt+tasti freccia, un generatore di codice PHP5, diagrammi di relazioni tra entità e molte correzioni.</p>\n"
+#~ msgid ""
+#~ "<p>Welcome to Umbrello 1.4.  New in this version are tabbed diagrams, "
+#~ "canvas items can be moved with Alt+arrowkeys, a PHP 5 code generator, "
+#~ "entity relationship diagrams and many fixes.</p>\n"
+#~ msgstr ""
+#~ "<p>Benvenuto a Umbrello 1.4. Di nuovo in questa versione ci sono i "
+#~ "diagrammi a schede, gli elementi a tela possono essere spostati con Alt"
+#~ "+tasti freccia, un generatore di codice PHP5, diagrammi di relazioni tra "
+#~ "entità e molte correzioni.</p>\n"
 
 #~ msgid "Creates UML::Package objects"
 #~ msgstr "Crea oggetti UML::pacchetto"
@@ -4142,7 +4250,8 @@ msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 #~ msgid "Creates association relationships between UML elements"
 #~ msgstr "Crea relazioni di associazioni tra gli elementi UML"
 
-#~ msgid "Creates unidirectional association relationships between UML elements"
+#~ msgid ""
+#~ "Creates unidirectional association relationships between UML elements"
 #~ msgstr "Crea relazioni di associazione unidirezionale tra gli elementi UML"
 
 #~ msgid ""
@@ -4207,10 +4316,12 @@ msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 #~ msgstr "Pacchetto genitore:"
 
 #~ msgid ""
-#~ "<p>Many new code generators have been added in this release.  You can now generate code for\n"
+#~ "<p>Many new code generators have been added in this release.  You can now "
+#~ "generate code for\n"
 #~ "JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, IDL and Ada.</p>\n"
 #~ msgstr ""
-#~ "<p>Molti nuovi generatori di codice sono stati aggiunti in questa versione. Ora puoi generare codice per\n"
+#~ "<p>Molti nuovi generatori di codice sono stati aggiunti in questa "
+#~ "versione. Ora puoi generare codice per\n"
 #~ "Javascript, ActionScript, XMLSchema, Perl, Python, SQL, IDL e Ada.</p>\n"
 
 #~ msgid "Delete Association"
@@ -4228,16 +4339,20 @@ msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 #~ msgid ""
 #~ "<p>Welcome to Umbrello UML Modeller 1.2.  UML lets you create models of\n"
 #~ "software systems in a standard diagramming language.  Please read the\n"
-#~ "Umbrello Handbook, available from the Help menu, to learn more about UML.</p>\n"
+#~ "Umbrello Handbook, available from the Help menu, to learn more about UML."
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p>Benvenuto nel modellatore UML Umbrello 1.2.  UML ti permette di creare\n"
+#~ "<p>Benvenuto nel modellatore UML Umbrello 1.2.  UML ti permette di "
+#~ "creare\n"
 #~ "modelli di sistemi software in un linguaggio standard a diagramma.\n"
 #~ "Per piacere, leggi il manuale di Umbrello, disponibile dal menu Aiuto,\n"
 #~ "per saperne di più su UML.</p>\n"
 
 #~ msgid ""
-#~ "<p>New features in Umbrello 1.2 include undo/redo, zoom, resizeable canvas, \n"
-#~ "new widget and diagram types, a refactoring agent, class templates/generics\n"
+#~ "<p>New features in Umbrello 1.2 include undo/redo, zoom, resizeable "
+#~ "canvas, \n"
+#~ "new widget and diagram types, a refactoring agent, class templates/"
+#~ "generics\n"
 #~ "and improved Java and C++ code generation.</p>\n"
 #~ msgstr ""
 #~ "<p>Le nuove caratteristiche di Umbrello 1.2 includono annulla/ripeti,\n"
@@ -4245,9 +4360,6 @@ msgstr "Si è verificato un problema durante il salvataggio del diagramma in %1"
 #~ "e di diagrammi, un agente di ricostruzione, modelli di classi,\n"
 #~ "e dei generatori di codice migliorati per Java e C++.</p>\n"
 
-#~ msgid "&Ok"
-#~ msgstr "&Ok"
-
 #~ msgid ""
 #~ "*.xmi|Umbrello XMI Files\n"
 #~ "*|All Files"
diff --git a/tde-i18n-ja/messages/tdesdk/umbrello.po b/tde-i18n-ja/messages/tdesdk/umbrello.po
index 05c2d6a67fb..df7cbf0fca4 100644
--- a/tde-i18n-ja/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ja/messages/tdesdk/umbrello.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-11-18 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -22,246 +22,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML モデラー 自立型コードジェネレータ"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "変換するファイル"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "使用する XSLT ファイル"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML モデラー作者"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML モデラーの作者"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ABE Masanori, Shinya TAKEBAYASHI"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "すべてのビューをエクスポート..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "maas_abb@ybb.ne.jp, makoto@kanon-net.jp"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "画像のエクスポート中にエラーが発生しました:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "ファイル %1 の保存で問題がありました。"
+#: 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/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 "保存エラー"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "左揃え"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "オブジェクト"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "右揃え"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "同期メッセージ"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "上揃え"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "非同期メッセージ"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "下揃え"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "関連"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "垂直方向中央揃え"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "包含"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "水平方向中央揃え"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "アンカー"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "垂直方向均等配置"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "ラベル"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "水平方向均等配置"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "ノート"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"整列させるためには、クラスやアクターなど、少なくとも 2 つのオブジェクトを選択"
+"する必要があります。結合を整列させることはできません。"
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "ボックス"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "フォーマット"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "アクター"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "依存"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "汎化"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "集約"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "関係"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "方向付き関連"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "実装 (汎化/実現関係)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "コンポジション"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "クラス"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "開始状態"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "終了状態"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "ブランチ/マージ"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "フォーク/ジョイン"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "パッケージ"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "コンポーネント"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "ノード"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "依存"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "成果物"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "関連"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "インターフェース"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "自己関連"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "データタイプ"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "コラボレーションメッセージ"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "列挙"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "シーケンスメッセージ"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "エンティティ"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "コラボレーション自己メッセージ"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "深い履歴"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "シーケンス自己メッセージ"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "浅い履歴"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "包含"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "ジョイン"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "コンポジション"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "フォーク"
+#: association.cpp:95
+msgid "Realization"
+msgstr "実現"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "結合"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "一方向関連"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "選択"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "アンカー"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "状態遷移"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "アクティビティ遷移"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "アクティビティ"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "状態"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "多重度"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "終了アクティビティ"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "多重度を入力:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "開始アクティビティ"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "関連名"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "メッセージ"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "関連名を入力:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "未定義"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "ロール名"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "選択"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "ロール名を入力:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "無効な名前です。"
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "無効な名前"
+
+#: 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 "その名前は既に使われています。"
+
+#: 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 "名前が重複"
 
 #: 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."
+"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 ""
-"同じ名前の項目が既に存在するため、少なくともクリップボードの項目の 1 つを貼り付けることができませんでした。他のアイテムは既に貼り付けられています。"
+"同じ名前の項目が既に存在するため、少なくともクリップボードの項目の 1 つを貼り"
+"付けることができませんでした。他のアイテムは既に貼り付けられています。"
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -271,17 +233,17 @@ msgstr "貼り付けエラー"
 msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
-msgstr "ファイル %1 を書き込みのために開けません。フォルダが存在し、書き込み権限があるかどうか確認してください。"
+msgstr ""
+"ファイル %1 を書き込みのために開けません。フォルダが存在し、書き込み権限があ"
+"るかどうか確認してください。"
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "ファイルを開けません"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"フォルダを作成できません。\n"
+msgid "Cannot create the folder:\n"
+msgstr "フォルダを作成できません。\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1320 +257,1518 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "フォルダを作成できません"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "状態名を入力"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "一般オプション"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "新規状態の名前を入力:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "パッケージは名前空間です"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "アクティビティを入力"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "仮想デストラクタ"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "新規アクティビティの名前を入力:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "空のコンストラクタを生成"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "新規アクティビティ"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "アクセッサメソッドを生成"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML モデル"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "操作はインラインです"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "論理ビュー"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "アクセッサをインライン化"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "ユースケースビュー"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "アクセッサはパブリックです"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "コンポーネントビュー"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "ファイルをインポート中: %1 進捗: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "配置ビュー"
+#: 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 "準備完了。"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "エンティティ関係モデル"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "スコープ %1 は名前空間ですか？クラスですか？"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "データタイプ"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "ヘルプに対する C++ インポートリクエスト"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"現在のファイルは変更されています。\n"
-"保存しますか？"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "名前空間"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "ファイル %1 は存在しません。"
+#: 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 "クラス"
 
-#: 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 "ロードエラー"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "内部エラー"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "ファイル %1 は壊れているようです。"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "\"%1\" の前で文法エラー"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "圧縮ファイル %1 内に XMI ファイルが見つかりませんでした。"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "\"%1\" の前で解析エラー"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "抽出ファイル %1 のロードで問題がありました。"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "ファイル %1 のロードで問題がありました。"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "式を期待"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "ファイル %1 をアップロードで問題がありました。"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "宣言文法エラー"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "ユースケース図"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} を期待"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "クラス図"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace を期待"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "シーケンス図"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ を期待"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "コラボレーション図"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "名前空間名を期待"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "状態図"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "宣言のために型指定子が必要"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "アクティビティ図"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "宣言を期待"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "コンポーネント図"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "定数式を期待"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "配置図"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' を期待"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "エンティティ関係図"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "名前"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "名前を入力:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "基本クラス指定子を期待"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "無効な図の名前です。"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "初期化節を期待"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "無効な名前"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "識別子を期待"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "その名前は既に図で使われています。"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "型 ID を期待"
 
-#: 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 "名前が重複"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "無効な名前です。"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "その名前は既に使われています。"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "ステートメントを期待"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"入力された名前は重複しています。\n"
-"本当にこれでよろしいですか？"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for 初期化を期待"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "名前の重複"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch を期待"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "名前を使う"
+#: 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 "プロパティ(&P)"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "新しい名前を入力"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "開始アクティビティ"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "本当に図 %1 を削除しますか？"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "終了アクティビティ"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "図を削除"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "ブランチ/マージ"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "文書を設定..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "フォーク/ジョイン"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "オブジェクト間参照を解決しています..."
+#: 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 "一般"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML エレメントをロード..."
+#: 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 "一般プロパティ"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "図をロード..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "アクティビティのタイプ:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "アクティビティ名:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/自動保存 %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 "ドキュメンテーション"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "フォント:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "フォントの設定"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "色"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "表示"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "ウィジェットの色"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"入力された名前は無効です。\n"
-"作成はキャンセルされました。"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "アクティビティ"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "名前が無効"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "新規アクティビティ..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"入力された名前は重複しています。\n"
-"作成はキャンセルされました。"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "アンカーを削除"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "作成はキャンセルされました"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "名前変更"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "リストビューをロードしています..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "新規アクティビティ"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "フォルダは削除する前に空にする必要があります。"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "新規アクティビティ"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "フォルダが空ではありません"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "アクティビティ名を変更"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "同じ名前とシグニチャをもつ操作が既に存在します。二回追加することはできません。"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "アクティビティの新しい名前を入力:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "アクティビティ名を入力"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "名前:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "新規状態"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "タイプ:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "汎化"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "関連"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "自己関連"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "関連のプロパティ"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "一般的な設定"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "シーケンスメッセージ"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "ロール"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "コラボレーション自己メッセージ"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "ロールの設定"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "シーケンス自己メッセージ"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "関連のフォント"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "実現"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "ロール A のプロパティ"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "一方向関連"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "ロール B のプロパティ"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "エクスポート(&E)"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "ロール A の可視性"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "図(&D)"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "ロール B の可視性"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "新規(&N)"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "ロール A の可変性"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "表示(&O)"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "ロール B の可変性"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "コード(&C)"
+msgid "Rolename:"
+msgstr "ロール名:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "アクティブな言語(&L)"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "ドキュメンテーション"
+msgid "Public"
+msgstr "Public"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Slash-Slash (//)"
+msgid "Private"
+msgstr "Private"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Slash-Star (/**  */)"
+msgid "Protected"
+msgstr "Protected"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "スタイル:"
+msgid "Implementation"
+msgstr "実装"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ コード生成</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "一般"
+msgid "Frozen"
+msgstr "変更不可"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "メソッド本体の生成"
+msgid "Add only"
+msgstr "追加のみ"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "以下のものをコード生成においてクラスとして使う:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "クラス名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "アクター名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "パッケージ名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>変数</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "ユースケース名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "インターフェース名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "コンポーネント名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "成果物名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "列挙名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "データタイプ名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "エンティティ名(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "グローバル？"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "ステレオタイプ名(&S):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "パッケージ名(&P):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "クラス名"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "抽象クラス(&B)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">インクルードファイル</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "抽象ユースケース(&B)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "プロジェクトの生成"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "実行ファイル(&E)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Ant ビルド文書を生成"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "描画"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "自動生成メソッド"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "標準(&D)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "空のコンストラクタ"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "塗りつぶし(&F):"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "関連のアクセッサメソッド"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "ライブラリ(&L)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "属性のアクセッサメソッド"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "テーブル(&T)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+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 "Private"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "Public(&U)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "Private(&R)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "親オブジェクトから"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Protected(&T)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "属性アクセッサのデフォルトのスコープ:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "実装(&M)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "関連フィールドのデフォルトのスコープ:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "クラス名:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "親のロールから"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "インスタンス名:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java コード生成</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "アクターとして描画"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "ハッシュ (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "複数のインスタンス"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "始め - 終わり (=begin =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "デストラクタを表示"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby コード生成</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "コンポーネント図:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "ノード名:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "ステレオタイプ名:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: 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 ""
+"選択された名前は既に\n"
+"使われています。\n"
+"名前はリセットされました。"
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "名前が重複"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "属性"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "新規属性(&E)..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "操作"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "新規操作(&E)..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "テンプレート"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "新規テンプレート(&E)..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "列挙リテラル"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "新規列挙リテラル(&E)..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "エンティティ属性"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "新規エンティティ属性(&E)..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "アンカーを削除"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "プロパティ(&P)"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "表示"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "操作(&N)"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "可視性(&V)"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "操作のシグニチャ(&P)"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "パッケージ(&K)"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "属性(&R)"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "ステレオタイプ(&Y)"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "属性のシグニチャ(&I)"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "円として描画"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "表示"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "表示のオプション"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "属性の設定"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "操作の設定"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "テンプレートの設定"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "列挙リテラルの設定"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "エンティティ属性の設定"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "包含"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "内容の設定"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "クラス関連"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "新規クラス"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "新規クラス"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "クラス属性"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "クラス操作"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "コード生成のオプション"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "言語"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "生成(&G)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "フォルダ"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "完了"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "生成されたすべてのファイルを書き込むフォルダ:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "コードが生成されました"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "ブラウズ(&W)..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "生成されていません"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "ブラウズ(&R)..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "まだ生成されていません"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "次のフォルダからヘッダファイルをインクルードする(&I):"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "フォルダ %1 は存在しません。今作成しますか？"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "コード生成によってできるファイルはこのフォルダに格納されます"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "出力フォルダは存在しません"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "フォルダを作成"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "生成しない"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
-msgstr "このフォルダ内のファイルはコード生成においてヘッダファイルとして使われます"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
+msgstr ""
+"フォルダを作成できませんでした。\n"
+"親フォルダに書き込み権限があるか確認するか、\n"
+"他の有効なフォルダを選択してください。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "ポリシーを上書き"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "フォルダ作成エラー"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "有効なフォルダを選択してください。"
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
-msgstr "コードジェネレータの出力ファイルと同名のファイルが既に存在する場合:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
+msgstr ""
+"出力フォルダは存在しますが、書き込みできません。\n"
+"適切なパーミッションを設定するか、他のフォルダを選択してください。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "上書き(&V)"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "出力フォルダヘの書き込みエラー"
 
-# @info:whatsthis
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "出力先フォルダの既存のファイルを上書きします。"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 はフォルダではないようです。有効なフォルダを選択してください。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "確認する(&K)"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "有効なフォルダを選択してください"
 
-# @info:whatsthis
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "同名のファイルが存在する場合は、どうするか尋ねます。"
+msgid "Code Viewer"
+msgstr "コードビューア"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "他の名前を使う(&U)"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">利用可能なオプションがありません。</p>"
 
-# @info:whatsthis
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "図(&D)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "フォーマット"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "フィルタ"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "行"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "現在の図(&C)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "改行スタイル:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "すべての図(&A)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "行下げのタイプ:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "図を選択(&S)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "行下げの量:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "図のタイプ(&T)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "選択"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "ユースケース"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "コラボレーション"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "シーケンス"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "状態"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "コンポーネント"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "配置"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "図が選択されていません。"
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "画像をエクスポートするフォーマット"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "ノートのドキュメンテーション"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "目的のファイルは既に存在します"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"*NIX (\"\\n\")"
+"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 ""
-"*NIX (\"\\n\")"
+"ファイル %1 は既に %2 に存在します。\n"
+"\n"
+"ファイルを上書きする、似たファイル名を生成する、\n"
+"ファイルを生成しないのいずれかを選択してください。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "残りのすべてのファイルに適用する(&A)"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "上書き(&O)"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "似たファイル名を生成(&G)"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "ファイルを生成しない(&D)"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "パラメータのプロパティ"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "タイプ(&T):"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "名前(&N):"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "初期値(&I):"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "一時的な指示"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Windows (\"\\r\\n\")"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Windows (\"\\r\\n\")"
+"\"in\" は、読み込み専用のパラメータ、\"out\" は書き込み専用のパラメー"
+"タ、\"inout\" は読み書き用のパラメータです。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "包含要素"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "行下げなし"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "操作を選択"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "タブ"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "シーケンス番号:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "スペース"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "クラス操作:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "コメントの頻度"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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"
-msgstr "セクションが空であっても、セクションに対するコメントを記述する(&F)"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Umbrello の設定"
 
-# @info:whatsthis
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
-msgstr "セクションが空であっても、セクションが違うことを示すコメント (public, private など) を記述します。"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "ユーザインターフェース"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "空であっても、ドキュメントのコメントを記述する(&W)"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+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"
-msgstr "クラスとメソッドに関するドキュメントが空であっても、コメントを記述する(&F)"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "線の色:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "言語のオプション"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "標準の色(&E)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "コード生成ウィザード"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "塗りつぶしの色:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "クラスを選択"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "標準の色(&F)"
 
-#. 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"
-msgstr "コードを生成するすべてのクラスを、右側のリストに置いてください"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "線の幅:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "コード生成にクラスを追加する"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "標準の幅(&E)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "選択されたクラス"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "塗りつぶしの色を使う(&U)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "コード生成からクラスを外す"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "利用可能なクラス"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "元に戻す操作を有効にする"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "コード生成のステータス"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "タブ図を使う"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "生成ボタンを押すと、コード生成を開始します"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "新しい C++/Java/Ruby ジェネレータを使う"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "生成のステータス"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "角のある関連線を使う"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "コードビューア"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "自動保存"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "隠しブロックを表示"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "自動保存を有効にする(&N)"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">コンポーネント名をここに記入します</p>"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "自動保存の間隔を選択 (分):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "ブロックタイプを表示"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "自動保存のサフィックスを設定:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "色"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>ユーザが保存する前に自動保存される場合、自動保存ファイルは ~/autosave."
+"xmi に作成されます。</p><p>ユーザが既い保存した場合、自動保存ファイルは同じ"
+"フォルダ内に、同じファイル名の後に指定されたサフィックスをつないで作成されま"
+"す。</p><p>もしサフィックスが保存したファイルのサフィックスと同じ場合、自動保"
+"存はユーザのファイルを上書きします。</p></qt>"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "フォント:"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "起動"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "用紙:"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "起動時のロゴ(&R)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "選択済み:"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "今日の一言(&T)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML オブジェクトブロック:</p>"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "最近のプロジェクトをロード(&L)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">隠しブロック:</p>"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "プロジェクト開始時の図:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">編集不可のテキスト:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "図なし"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">編集可能なテキスト:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "クラス図"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "図のプロパティ"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "ユースケース図"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "名前:"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "シーケンス図"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "ズーム:"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "コラボレーション図"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "状態図"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "アクティビティ図"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "コンポーネント図"
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "配置図"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "クラスの設定"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "可視性を表示(&V)"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "属性を表示"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "操作を表示"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "ステレオタイプを表示(&Y)"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "属性のシグニチャを表示"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "パッケージを表示"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "操作のシグニチャを表示"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "グリッドを表示(&G)"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "開始スコープ"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "グリッドに位置を合わせる(&T)"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "属性のデフォルトのスコープ:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "コンポーネントサイズを合わせる"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+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."
-msgstr ""
-"グリッドの倍数になるように、コンポーネントのサイズを合わせます。\n"
-"「グリッドに位置を合わせる」を有効にすると、コンポーネントは常にグリッドの四隅に合わせられます。"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "コード生成"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "グリッドの大きさ: "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "コード生成の設定"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "コードビューアの設定"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "開始状態"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "線の幅:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "終了状態"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "すべてのビューをエクスポート"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "状態のタイプ:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "図を保存するフォルダ(&D):"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+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"
-msgstr "画像を保存するベースフォルダ"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "ウィジェットの色"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "画像のタイプ(&I):"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+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"
-msgstr "画像をエクスポートするフォーマット"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "分類子の範囲 (\"static\") (&S)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "フォルダを使う(&F)"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-# @option:check
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr "ビューを格納するため文書内で使われた木構造を対象フォルダに作成する"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Protected(&E)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "実装(&M)"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "無効な属性名が入力されました。"
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "属性名が無効"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"ビューは文書内のフォルダに格納されます。このオプションを使うと、ビューを格納するために文書内で使われる木構造を、指定したベースフォルダ内に作成することができます"
-"。\n"
-"ユーザが作成したビューのみがベースフォルダに作成されます。(論理ビューやユースケースビューなどは作成されません)"
+"The attribute name you have chosen 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"
-msgstr "ロールのプロパティ"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute 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:"
-msgstr "ロール名:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "エンティティ属性"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "多重度:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "既定値(&D):"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "ロールの可変性"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "長さ/値:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "追加のみ"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "自動インクリメント(&A)"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "変更不可"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Null を許可(&N)"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "変更可"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "属性:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "ロールの可視性"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "インデックス"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "実装"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "なし(&N)"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Umbrello へようこそ</p>\n"
-"<p>UML 図で、オブジェクト指向ソフトウェアを設計したり記録したりすることができます。<a href=\"help:/umbrello\">"
-"Umbrello ハンドブック</a> は、UML を使うにあたって良い手引きです。</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "プライマリ(&P)"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Umbrello 1.5 へようこそ。このバージョンで新しいことは、接点のクラス、Ruby "
-"コード生成、外部化可能フォルダと、インターフェースをクラスに変える機能などです。</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "インデックス(&I)"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>タブダイアグラムと外部ダイアグラムは、互いに排他です。外部ダイアグラムが必要ならば、一般設定で「タブダイアグラムを使う」を非選択としてください。</p>"
-"\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "一意(&U)"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>ほとんどの図はリサイズすることができず、それらはコンテンツに合うように自身をリサイズします。\n"
-"ボックス、ノート、シーケンス図メッセージはリサイズすることができ、赤い正方形をクリック・ドラッグするだけです。</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "無効なエンティティ属性名が入力されました。"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>図に既に存在するクラスを追加する場合は、ツリービューからそのエントリをドラッグしてください。</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "エンティティ属性名が無効"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Umbrello "
-"のリファクタリングエージェントは、生成されたクラスや基本クラスの移動操作を行います。クラスを右クリックすると、リファクタリングエージェントを開きます。</p>"
-"\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "選択されたエンティティ属性名はこの操作で既に使われています。"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>シーケンス図は、デストラクタボックスを持つことができ、アクターとして描かれます。\n"
-"プロパティダイアログを開くため、それをダブルクリックしてください。</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name 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"
-msgstr ""
-"<p>シーケンス図メッセージは、コンストラクタとして機能することができます。オブジェクトボックス (縦線よりも) "
-"をクリックして、コンストラクタにしてください。</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "操作のプロパティ"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>シーケンス図は、自分自身に対するメッセージをサポートします。同じ縦線をクリックすることで、自動メッセージを作成することができます。</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "抽象操作(&A)"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>外部ファイルを読み込んだときにリストビューに何も表示されない場合、モデルを別名で保存し、閉じ、再度保存したファイルを読み込んでください。\n"
-"通常、リストビューは適切に表示されます。\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "クエリ (\"const\") (&Q)"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>切り取りやコピーは、KWord や他のアプリケーションに貼り付けることができる PNG イメージとして、クリップボードにエクスポートします。</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "パラメータ"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>接点が直線上にある必要はなく、一カ所をダブルクリックすることで移動する点を作成することができます。</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "新規パラメータ(&W)..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Umbrello 設定ダイアログで、自動保存を有効にすることができます。</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "無効なパラメータ名が入力されました。"
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>必要とする機能が Umbrello に欠けていますか？私たちに知らせてください。\n"
-"ヘルプメニューにあるバグ通知でバグデータベースに追加するか、またはそれを uml-devel メーリングリストに送ってください。</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "パラメータ名が無効"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Del キーや Backspace キーを押すことで、選択したオブジェクトを削除することができます。</p>\n"
+"選択されたパラメータはこの操作で既に\n"
+"使われています。"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Umbrello でバグを見つけた場合は、私たちに知らせてください。\n"
-"ヘルプメニューのバグ通知ツールで送信することができます。</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "パラメータ名が重複"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>エスケープキーを押すことで、現在のツールを選択ツールにすることができます。\n"
-"バックスペースは前に使っていたツールにジャンプします。</p>\n"
+"選択されたパラメータはこの操作で既に\n"
+"使われています。"
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "無効な操作名が入力されました。"
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "操作名が無効"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "そのシグニチャをもつ操作は既に %1 に存在します。\n"
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "他の名前かパラメータリストを選択してください。"
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "ロールのプロパティ"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "テンプレートのプロパティ"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "無効なテンプレート名が入力されました。"
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "テンプレート名が無効"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Ctrl+A を押すことで、すべてのオブジェクトを選択することができます。</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "選択されたテンプレートパラメータは、この操作で既に使われています。"
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "テンプレート名が重複"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "クラス表示のオプション"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "図の色"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "入力された名前は無効です。"
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "入力された名前は重複しています。"
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "名前の重複"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "線(&L):"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "塗りつぶし(&F):"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "標準(&E)"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "塗りつぶした色を使う(&U)"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "すべてのビューをエクスポート..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+msgstr "ファイル %1 の保存で問題がありました。"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "保存エラー"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML モデラー 自立型コードジェネレータ"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "変換するファイル"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "使用する XSLT ファイル"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>「コード」メニューの「新規クラスウィザード」を使用して、新しいクラスを作ったりセットアップすることができます。</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML モデラー作"
+"者"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML モデラーの作者"
+
+#: 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 "名前"
+
+#: 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 "名前を入力:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "操作名を入力:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "新規テキストを入力:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "エラー"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "テキストを変更"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "ファイル %1 は存在しません。"
+
+#: 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 "ロードエラー"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "ファイル %1 を開けません。"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1662,6 +1822,10 @@ msgstr "新規操作..."
 msgid "Select Operation..."
 msgstr "操作を選択..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "テキストを変更..."
@@ -1713,6 +1877,19 @@ msgstr "新規作成"
 msgid "Rename..."
 msgstr "名前変更..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "貼り付けエラー"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "線の色..."
@@ -1741,14 +1918,26 @@ msgstr "フォルダを格納"
 msgid "Import Classes..."
 msgstr "クラスをインポート..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "パッケージ"
+
 #: 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 "ノード"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "配置図..."
@@ -1757,10 +1946,18 @@ msgstr "配置図..."
 msgid "Folder"
 msgstr "フォルダ"
 
+#: 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 "ユースケース図..."
@@ -1797,6 +1994,18 @@ msgstr "新規エンティティ属性..."
 msgid "Export as Picture..."
 msgstr "画像としてエクスポート..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "インターフェース"
+
+#: 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 "クラス図..."
@@ -1817,26 +2026,10 @@ msgstr "シーケンス図..."
 msgid "Collaboration Diagram..."
 msgstr "コラボレーション図..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "属性"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "操作"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "public のみ"
 
-#: 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 "操作のシグニチャ"
@@ -1849,11 +2042,6 @@ msgstr "属性のシグニチャ"
 msgid "Stereotype"
 msgstr "ステレオタイプ"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "表示"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "属性..."
@@ -1878,14 +2066,6 @@ msgstr "塗りつぶしの色..."
 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 "色"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "アクター..."
@@ -1914,10 +2094,26 @@ msgstr "列挙..."
 msgid "Package..."
 msgstr "パッケージ..."
 
+#: 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 "状態..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "開始アクティビティ"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "終了アクティビティ"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "サブシステム..."
@@ -1962,6 +2158,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 "図をクリア"
@@ -1996,195 +2200,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 "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML モデラーの作者"
 
-#: 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 "ファイル %1 は存在しません。"
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "ファイル %1 を開けません。"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ABE Masanori, Shinya TAKEBAYASHI"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "maas_abb@ybb.ne.jp, makoto@kanon-net.jp"
-
-#: 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 "準備完了。"
-
-#: 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 ""
-"Shift か Ctrl を押して X 軸方向へ移動。Shift と Ctrl を押して Y 軸方向へ移動。右ボタンクリックで移動をキャンセル。"
-
-#: 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 ""
-"Shift か Ctrl を押して X 軸方向へ移動。Shift と Ctrl を押して Y 軸方向へ移動。右ボタンクリックでリサイズをキャンセル。"
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "スコープ %1 は名前空間ですか？クラスですか？"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "ヘルプに対する C++ インポートリクエスト"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "名前空間"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "ファイルをインポート中: %1 進捗: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "内部エラー"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "\"%1\" の前で文法エラー"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "\"%1\" の前で解析エラー"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<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"
-msgstr "式を期待"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "新規ユースケース"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "宣言文法エラー"
+#: 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"
-msgstr "} を期待"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "新規コンポーネント"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace を期待"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "新規ノード"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ を期待"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "新規成果物"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "名前空間名を期待"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "新規インターフェース"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "宣言のために型指定子が必要"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "新規データタイプ"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "宣言を期待"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "新規列挙"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "定数式を期待"
+#: 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
+msgid "new_folder"
+msgstr "新規フォルダ"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} がありません"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "新規関連"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "メンバ初期化子を期待"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "新規オブジェクト"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "基本クラス指定子を期待"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "初期化節を期待"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "空"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "識別子を期待"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "不正な形式の引数"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "型 ID を期待"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "不明な引数の型"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "クラス名を期待"
+#: 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"
-msgstr "条件を期待"
+#: 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"
-msgstr "ステートメントを期待"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "不明なエラー"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for 初期化を期待"
+#: 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"
-msgstr "catch を期待"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "予約語"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2198,105 +2309,66 @@ msgstr "オブジェクト名を入力:"
 msgid "new_parameter"
 msgstr "新規パラメータ"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "一般オプション"
-
-#: 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"
-msgstr "図: %2 ページ: %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "図の名前を入力"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "親クラスを追加"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "図の新しい名前を入力:"
+#: 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?"
-msgstr ""
-"図全体を削除しようとしています。\n"
-"よろしいですか？"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "操作を追加"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "図を削除しますか？"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "属性を追加"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "名前の変更はキャンセルされました"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "親インターフェースを追加"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "リストビュータイプ %1 のアイテムの名前変更は、まだ実装されていません"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "派生インターフェースを追加"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "関数が実装されていません"
+#: 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."
-msgstr ""
-"入力された名前は無効です。\n"
-"名前変更はキャンセルされました。"
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "派生分類子"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "新規関連"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "状態名を入力"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "新規属性"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "新規状態の名前を入力:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "新規テンプレート"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "アクティビティを入力"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "新規操作"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "関連が間違った使われ方をしています。"
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "新規リテラル"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "関連エラー"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "新規フィールド"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "新規状態"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2451,11 +2523,6 @@ msgstr "画像としてエクスポート(&E)..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "すべての図を画像としてエクスポート(&A)..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "プロパティ(&P)"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "ズーム率(&Z)"
@@ -2540,21 +2607,28 @@ msgstr "ドキュメンテーション(&D)"
 msgid "Opening file..."
 msgstr "ファイルを開いています..."
 
+#: 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 "新しい文書を作成しています..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|サポートされたファイルすべて (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|サポートされたファイルすべて (*.xmi, *."
+"xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|非圧縮 XMI ファイル (*.xmi)\n"
 "*.xmi.tgz|Gzip 圧縮 XMI ファイル (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 圧縮 XMI ファイル (*.xmi.tar.bz2)\n"
@@ -2584,6 +2658,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 圧縮された XMI ファイル\n"
 "*|すべてのファイル"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2592,6 +2670,10 @@ msgstr ""
 "ファイル %1 は存在します。\n"
 "上書きしますか？"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "上書き"
@@ -2627,10 +2709,11 @@ msgstr "クリップボードの内容を挿入中..."
 
 #: 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 ""
-"Umbrello はクリップボードの内容を貼り付けることができませんでした。クリップボードの内容はおそらくここに貼り付けるタイプではないのでしょう。"
+"Umbrello はクリップボードの内容を貼り付けることができませんでした。クリップ"
+"ボードの内容はおそらくここに貼り付けるタイプではないのでしょう。"
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2684,1251 +2767,1305 @@ msgstr "すべてのファイル"
 msgid "Select Code to Import"
 msgstr "インポートするコードを選択"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "クラス名(&N):"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "アクター名(&N):"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "新規属性"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "パッケージ名(&N):"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "新規テンプレート"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "ユースケース名(&N):"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "新規操作"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "インターフェース名(&N):"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "新規リテラル"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "コンポーネント名(&N):"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "新規フィールド"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "成果物名(&N):"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML モデル"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "列挙名(&N):"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "論理ビュー"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "データタイプ名(&N):"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "ユースケースビュー"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "エンティティ名(&N):"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "コンポーネントビュー"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "ステレオタイプ名(&S):"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "配置ビュー"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "パッケージ名(&P):"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "エンティティ関係モデル"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "抽象クラス(&B)"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "データタイプ"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "抽象ユースケース(&B)"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"現在のファイルは変更されています。\n"
+"保存しますか？"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "実行ファイル(&E)"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "ファイル %1 は存在しません。"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "描画"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "ファイル %1 は壊れているようです。"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "標準(&D)"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "圧縮ファイル %1 内に XMI ファイルが見つかりませんでした。"
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "ライブラリ(&L)"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "抽出ファイル %1 のロードで問題がありました。"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "テーブル(&T)"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "ファイル %1 のロードで問題がありました。"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "Public(&U)"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "ファイル %1 をアップロードで問題がありました。"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "Private(&R)"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "ユースケース図"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Protected(&T)"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "クラス図"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "実装(&M)"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "シーケンス図"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "クラス名:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "コラボレーション図"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "インスタンス名:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "状態図"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "アクターとして描画"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "アクティビティ図"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "複数のインスタンス"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "コンポーネント図"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "デストラクタを表示"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "配置図"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "コンポーネント図:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "エンティティ関係図"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "ノード名:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "無効な図の名前です。"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "ステレオタイプ名:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "その名前は既に図で使われています。"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"選択された名前は既に\n"
-"使われています。\n"
-"名前はリセットされました。"
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "名前が重複"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "線(&L):"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "塗りつぶし(&F):"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "標準(&E)"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "塗りつぶした色を使う(&U)"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "アクティビティ"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "新規アクティビティ..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "名前変更"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "新規アクティビティ"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "アクティビティ名を変更"
+"入力された名前は重複しています。\n"
+"本当にこれでよろしいですか？"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "アクティビティの新しい名前を入力:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "名前を使う"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "関連のプロパティ"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+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 "一般的な設定"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "本当に図 %1 を削除しますか？"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "ロール"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "図を削除"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "ロールの設定"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+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 "フォントの設定"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "オブジェクト間参照を解決しています..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "関連のフォント"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML エレメントをロード..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "テンプレートのプロパティ"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+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 "一般プロパティ"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/自動保存 %1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "タイプ(&T):"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "フォルダを外部化"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "名前(&N):"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "モデル名を入力"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "無効なテンプレート名が入力されました。"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "モデルの新しい名前を入力:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "テンプレート名が無効"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "表示"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "選択されたテンプレートパラメータは、この操作で既に使われています。"
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "テンプレート名が重複"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"入力された名前は無効です。\n"
+"作成はキャンセルされました。"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "エンティティ属性"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "名前が無効"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "既定値(&D):"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"入力された名前は重複しています。\n"
+"作成はキャンセルされました。"
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "長さ/値:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "作成はキャンセルされました"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "自動インクリメント(&A)"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "リストビューをロードしています..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Null を許可(&N)"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "フォルダは削除する前に空にする必要があります。"
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "属性:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "フォルダが空ではありません"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "インデックス"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "名前の変更はキャンセルされました"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "なし(&N)"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "リストビュータイプ %1 のアイテムの名前変更は、まだ実装されていません"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "プライマリ(&P)"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "関数が実装されていません"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "インデックス(&I)"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"入力された名前は無効です。\n"
+"名前変更はキャンセルされました。"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "一意(&U)"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "図: %2 ページ: %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "無効なエンティティ属性名が入力されました。"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "図の名前を入力"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "エンティティ属性名が無効"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "図の新しい名前を入力:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "選択されたエンティティ属性名はこの操作で既に使われています。"
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "エンティティ属性名が重複"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "表示"
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"図全体を削除しようとしています。\n"
+"よろしいですか？"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "クラス表示のオプション"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "図を削除しますか？"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "図の色"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "ビューをエクスポート..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "入力された名前は無効です。"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "画像のエクスポート中にエラーが発生しました:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "入力された名前は重複しています。"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"選択されたファイル %1 は既に存在します。\n"
+"上書きしますか？"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "タイプ:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "ファイルは既に存在します"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello の設定"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "フォルダを作成できません: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "ユーザインターフェース"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "空の図は保存できません"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "ユーザインターフェースの設定"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "%1 に図を保存中にエラーが発生しました"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "線の色:"
+#: 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 ""
+"Shift か Ctrl を押して X 軸方向へ移動。Shift と Ctrl を押して Y 軸方向へ移"
+"動。右ボタンクリックで移動をキャンセル。"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "標準の色(&E)"
+#: 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 ""
+"Shift か Ctrl を押して X 軸方向へ移動。Shift と Ctrl を押して Y 軸方向へ移"
+"動。右ボタンクリックでリサイズをキャンセル。"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "塗りつぶしの色:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "オブジェクト"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "標準の色(&F)"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "同期メッセージ"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "線の幅:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "非同期メッセージ"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "標準の幅(&E)"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "ラベル"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "塗りつぶしの色を使う(&U)"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "ノート"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "元に戻す操作を有効にする"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "ボックス"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "タブ図を使う"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "関係"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "新しい C++/Java/Ruby ジェネレータを使う"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "方向付き関連"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "角のある関連線を使う"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "実装 (汎化/実現関係)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "自動保存"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "深い履歴"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "自動保存を有効にする(&N)"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "浅い履歴"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "自動保存の間隔を選択 (分):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "ジョイン"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "自動保存のサフィックスを設定:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "フォーク"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>ユーザが保存する前に自動保存される場合、自動保存ファイルは ~/autosave.xmi に作成されます。</p>"
-"<p>ユーザが既い保存した場合、自動保存ファイルは同じフォルダ内に、同じファイル名の後に指定されたサフィックスをつないで作成されます。</p>"
-"<p>もしサフィックスが保存したファイルのサフィックスと同じ場合、自動保存はユーザのファイルを上書きします。</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "結合"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "起動"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "選択"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "起動時のロゴ(&R)"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "アクティビティ遷移"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "今日の一言(&T)"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "メッセージ"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "最近のプロジェクトをロード(&L)"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "未定義"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "プロジェクト開始時の図:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "選択"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "図なし"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "クラス図"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "ユースケース図"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "シーケンス図"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "コラボレーション図"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "操作を表示"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "状態図"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "アクティビティ図"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "図をクリア"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "コンポーネント図"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "配置図"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "汎化"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "クラスの設定"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "可視性を表示(&V)"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "属性を表示"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "関連名"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "操作を表示"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "ステレオタイプを表示(&Y)"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "属性のシグニチャを表示"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "パッケージを表示"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "標準(&D)"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "開始スコープ"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "属性のデフォルトのスコープ:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-Slash (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "操作のデフォルトのスコープ:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-Star (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "コード生成"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "スタイル:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "コード生成の設定"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ コード生成</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "コードビューアの設定"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "メソッド本体の生成"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "操作のプロパティ"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "以下のものをコード生成においてクラスとして使う:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "抽象操作(&A)"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "分類子の範囲 (\"static\") (&S)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "クエリ (\"const\") (&Q)"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>変数</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Protected(&E)"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "実装(&M)"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "パラメータ"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "新規パラメータ(&W)..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "無効なパラメータ名が入力されました。"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">List</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "パラメータ名が無効"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"選択されたパラメータはこの操作で既に\n"
-"使われています。"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "グローバル？"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "パラメータ名が重複"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"選択されたパラメータはこの操作で既に\n"
-"使われています。"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "クラス名"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "無効な操作名が入力されました。"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">インクルードファイル</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "操作名が無効"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "プロジェクトの生成"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"そのシグニチャをもつ操作は既に %1 に存在します。\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Ant ビルド文書を生成"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "他の名前かパラメータリストを選択してください。"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "自動生成メソッド"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "ロール A のプロパティ"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "空のコンストラクタ"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "ロール B のプロパティ"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "関連のアクセッサメソッド"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "ロール A の可視性"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "属性のアクセッサメソッド"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "ロール B の可視性"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "親オブジェクトから"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "ロール A の可変性"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "属性アクセッサのデフォルトのスコープ:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "ロール B の可変性"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "関連フィールドのデフォルトのスコープ:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "包含要素"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "親のロールから"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "ノートのドキュメンテーション"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java コード生成</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "新規属性(&E)..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "ハッシュ (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "新規操作(&E)..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "始め - 終わり (=begin =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "テンプレート"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby コード生成</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "新規テンプレート(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "言語"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "列挙リテラル"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "フォルダ"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "新規列挙リテラル(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "生成されたすべてのファイルを書き込むフォルダ:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "エンティティ属性"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "ブラウズ(&W)..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "新規エンティティ属性(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "ブラウズ(&R)..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "開始アクティビティ"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "次のフォルダからヘッダファイルをインクルードする(&I):"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "終了アクティビティ"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "コード生成によってできるファイルはこのフォルダに格納されます"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "アクティビティのタイプ:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"このフォルダ内のファイルはコード生成においてヘッダファイルとして使われます"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "アクティビティ名:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "ポリシーを上書き"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "ウィジェットの色"
+#: 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/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "属性のプロパティ"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "上書き(&V)"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "初期値(&I):"
+# @info:whatsthis
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "出力先フォルダの既存のファイルを上書きします。"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "確認する(&K)"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "無効な属性名が入力されました。"
+# @info:whatsthis
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "同名のファイルが存在する場合は、どうするか尋ねます。"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "属性名が無効"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "他の名前を使う(&U)"
 
-#: dialogs/umlattributedialog.cpp:163
+# @info:whatsthis
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "選択された属性名はこの操作で既に使われています。"
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "属性名が重複"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "フォーマット"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "操作を選択"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "行"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "シーケンス番号:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "改行スタイル:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "クラス操作:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "行下げのタイプ:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "カスタム操作:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "行下げの量:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "図(&D)"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "フィルタ"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "現在の図(&C)"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "すべての図(&A)"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "行下げなし"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "図を選択(&S)"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "タブ"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "図のタイプ(&T)"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "スペース"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "選択"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "コメントの頻度"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "コラボレーション"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "セクションが空であっても、セクションに対するコメントを記述する(&F)"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "シーケンス"
+# @info:whatsthis
+#: 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 ""
+"セクションが空であっても、セクションが違うことを示すコメント (public, "
+"private など) を記述します。"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "配置"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "空であっても、ドキュメントのコメントを記述する(&W)"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "図が選択されていません。"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"クラスとメソッドに関するドキュメントが空であっても、コメントを記述する(&F)"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "表示のオプション"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "言語のオプション"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "属性の設定"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "コード生成ウィザード"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "操作の設定"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "クラスを選択"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "テンプレートの設定"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr "コードを生成するすべてのクラスを、右側のリストに置いてください"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "列挙リテラルの設定"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "コード生成にクラスを追加する"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "エンティティ属性の設定"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "選択されたクラス"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "内容の設定"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "コード生成からクラスを外す"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "関連"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "利用可能なクラス"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "クラス関連"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "コード生成のステータス"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "操作(&N)"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "生成ボタンを押すと、コード生成を開始します"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "可視性(&V)"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "生成のステータス"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "操作のシグニチャ(&P)"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "隠しブロックを表示"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "パッケージ(&K)"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">コンポーネント名をここに記入します</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "属性(&R)"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "ステレオタイプ(&Y)"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "ブロックタイプを表示"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "属性のシグニチャ(&I)"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "色"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "円として描画"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "フォント:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "開始状態"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "用紙:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "終了状態"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "選択済み:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "状態のタイプ:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML オブジェクトブロック:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "状態名:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">隠しブロック:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "ウィジェットの色"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">編集不可のテキスト:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "新規クラス"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">編集可能なテキスト:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "新規クラス"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "図のプロパティ"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "クラス属性"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "ズーム:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "クラス操作"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "パラメータのプロパティ"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "グリッドを表示(&G)"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "一時的な指示"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "グリッドに位置を合わせる(&T)"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "コンポーネントサイズを合わせる"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr "\"in\" は、読み込み専用のパラメータ、\"out\" は書き込み専用のパラメータ、\"inout\" は読み書き用のパラメータです。"
+"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 ""
+"グリッドの倍数になるように、コンポーネントのサイズを合わせます。\n"
+"「グリッドに位置を合わせる」を有効にすると、コンポーネントは常にグリッドの四"
+"隅に合わせられます。"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "生成(&G)"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "グリッドの大きさ: "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "完了"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "コードが生成されました"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "生成されていません"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "線の幅:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "まだ生成されていません"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "すべてのビューをエクスポート"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "フォルダ %1 は存在しません。今作成しますか？"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "図を保存するフォルダ(&D):"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "出力フォルダは存在しません"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "画像を保存するベースフォルダ"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "フォルダを作成"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "画像のタイプ(&I):"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "生成しない"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "フォルダを使う(&F)"
 
-#: dialogs/codegenerationwizard.cpp:168
+# @option:check
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
-msgstr ""
-"フォルダを作成できませんでした。\n"
-"親フォルダに書き込み権限があるか確認するか、\n"
-"他の有効なフォルダを選択してください。"
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "フォルダ作成エラー"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "有効なフォルダを選択してください。"
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr "ビューを格納するため文書内で使われた木構造を対象フォルダに作成する"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"出力フォルダは存在しますが、書き込みできません。\n"
-"適切なパーミッションを設定するか、他のフォルダを選択してください。"
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "出力フォルダヘの書き込みエラー"
+"ビューは文書内のフォルダに格納されます。このオプションを使うと、ビューを格納"
+"するために文書内で使われる木構造を、指定したベースフォルダ内に作成することが"
+"できます。\n"
+"ユーザが作成したビューのみがベースフォルダに作成されます。(論理ビューやユース"
+"ケースビューなどは作成されません)"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 はフォルダではないようです。有効なフォルダを選択してください。"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "ロールの可変性"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "有効なフォルダを選択してください"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "ロールの可視性"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "目的のファイルは既に存在します"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "エクスポート(&E)"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"ファイル %1 は既に %2 に存在します。\n"
-"\n"
-"ファイルを上書きする、似たファイル名を生成する、\n"
-"ファイルを生成しないのいずれかを選択してください。"
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "残りのすべてのファイルに適用する(&A)"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "上書き(&O)"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "似たファイル名を生成(&G)"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "ファイルを生成しない(&D)"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">利用可能なオプションがありません。</p>"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "多重度"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "多重度を入力:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "関連名"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "関連名を入力:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "ロール名"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "ロール名を入力:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "操作名を入力:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "新規テキストを入力:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "エラー"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "テキストを変更"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "左揃え"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "右揃え"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "図(&D)"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "上揃え"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "新規(&N)"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "下揃え"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "表示(&O)"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "垂直方向中央揃え"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "ズーム:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "水平方向中央揃え"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "コード(&C)"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "垂直方向均等配置"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "アクティブな言語(&L)"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "水平方向均等配置"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr "整列させるためには、クラスやアクターなど、少なくとも 2 つのオブジェクトを選択する必要があります。結合を整列させることはできません。"
+"<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 ""
+"<p>Umbrello へようこそ</p>\n"
+"<p>UML 図で、オブジェクト指向ソフトウェアを設計したり記録したりすることができ"
+"ます。<a href=\"help:/umbrello\">Umbrello ハンドブック</a> は、UML を使うにあ"
+"たって良い手引きです。</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "これは設定されたコード生成の言語における予約語です。"
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "予約語"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "ビューをエクスポート..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Umbrello 1.5 へようこそ。このバージョンで新しいことは、接点のクラス、Ruby "
+"コード生成、外部化可能フォルダと、インターフェースをクラスに変える機能などで"
+"す。</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"画像のエクスポート中にエラーが発生しました:\n"
+"<p>タブダイアグラムと外部ダイアグラムは、互いに排他です。外部ダイアグラムが必"
+"要ならば、一般設定で「タブダイアグラムを使う」を非選択としてください。</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"選択されたファイル %1 は既に存在します。\n"
-"上書きしますか？"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "ファイルは既に存在します"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "新規アクター"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "新規ユースケース"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "新規パッケージ"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "新規コンポーネント"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "新規ノード"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "新規成果物"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "新規インターフェース"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "新規データタイプ"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "新規列挙"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "新規エンティティ"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "新規フォルダ"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "新規オブジェクト"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "空"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "不正な形式の引数"
+"<p>ほとんどの図はリサイズすることができず、それらはコンテンツに合うように自身"
+"をリサイズします。\n"
+"ボックス、ノート、シーケンス図メッセージはリサイズすることができ、赤い正方形"
+"をクリック・ドラッグするだけです。</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "不明な引数の型"
+#: 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 ""
+"<p>図に既に存在するクラスを追加する場合は、ツリービューからそのエントリをド"
+"ラッグしてください。</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "不正なメソッド名"
+#: 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 ""
+"<p>Umbrello のリファクタリングエージェントは、生成されたクラスや基本クラスの"
+"移動操作を行います。クラスを右クリックすると、リファクタリングエージェントを"
+"開きます。</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "不明な戻り値の型"
+#: 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 ""
+"<p>シーケンス図は、デストラクタボックスを持つことができ、アクターとして描かれ"
+"ます。\n"
+"プロパティダイアログを開くため、それをダブルクリックしてください。</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "不明なエラー"
+#: 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 ""
+"<p>シーケンス図メッセージは、コンストラクタとして機能することができます。オブ"
+"ジェクトボックス (縦線よりも) をクリックして、コンストラクタにしてください。"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "親クラスを追加"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>シーケンス図は、自分自身に対するメッセージをサポートします。同じ縦線をク"
+"リックすることで、自動メッセージを作成することができます。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "派生クラスを追加"
+#: 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 ""
+"<p>外部ファイルを読み込んだときにリストビューに何も表示されない場合、モデルを"
+"別名で保存し、閉じ、再度保存したファイルを読み込んでください。\n"
+"通常、リストビューは適切に表示されます。\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "操作を追加"
+#: 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 ""
+"<p>切り取りやコピーは、KWord や他のアプリケーションに貼り付けることができる "
+"PNG イメージとして、クリップボードにエクスポートします。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "属性を追加"
+#: 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 ""
+"<p>接点が直線上にある必要はなく、一カ所をダブルクリックすることで移動する点を"
+"作成することができます。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "親インターフェースを追加"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Umbrello 設定ダイアログで、自動保存を有効にすることができます。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "派生インターフェースを追加"
+#: 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 ""
+"<p>必要とする機能が Umbrello に欠けていますか？私たちに知らせてください。\n"
+"ヘルプメニューにあるバグ通知でバグデータベースに追加するか、またはそれを uml-"
+"devel メーリングリストに送ってください。</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "基本分類子"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Del キーや Backspace キーを押すことで、選択したオブジェクトを削除すること"
+"ができます。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "派生分類子"
+#: 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 ""
+"<p>Umbrello でバグを見つけた場合は、私たちに知らせてください。\n"
+"ヘルプメニューのバグ通知ツールで送信することができます。</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "フォルダを作成できません: %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 ""
+"<p>エスケープキーを押すことで、現在のツールを選択ツールにすることができま"
+"す。\n"
+"バックスペースは前に使っていたツールにジャンプします。</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "空の図は保存できません"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>Ctrl+A を押すことで、すべてのオブジェクトを選択することができます。</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "%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 ""
+"<p>「コード」メニューの「新規クラスウィザード」を使用して、新しいクラスを作っ"
+"たりセットアップすることができます。</p>\n"
diff --git a/tde-i18n-lt/messages/tdesdk/umbrello.po b/tde-i18n-lt/messages/tdesdk/umbrello.po
index 77a2b7d52e9..8ac82df91bf 100644
--- a/tde-i18n-lt/messages/tdesdk/umbrello.po
+++ b/tde-i18n-lt/messages/tdesdk/umbrello.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2005-09-02 17:30+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -16,1570 +16,1771 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr ""
+#: _translatorinfo:1
+#, fuzzy
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "(niekas)"
 
-#: docgenerators/main.cpp:47
+#: _translatorinfo:2
 #, fuzzy
-msgid "File to transform"
-msgstr "Atidaryti bylą"
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "(niekas)"
 
-#: 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 "Lygiuoti kairėje"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Lygiuoti dešinėje"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
 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:44
+msgid "Align Vertical Middle"
 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:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Apsukti horizontaliai"
+
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Apsukti horizontaliai"
+
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Apsukti horizontaliai"
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
 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 "Įrašymo klaida"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatuojama"
 
-#: worktoolbar.cpp:245
-msgid "Object"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
 msgstr ""
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
+#: association.cpp:84
+msgid "Generalization"
 msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
+
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
 msgstr ""
 
 #: association.cpp:87 worktoolbar.cpp:248
 msgid "Association"
 msgstr ""
 
+#: 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 "Antraštė"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
+msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Pastaba"
+#: 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"
+#: 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"
+#: 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 "Klasė"
+#: 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
+#, fuzzy
+msgid "Paste Error"
+msgstr "Ádëti Klaida"
+
+#: 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 ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
 msgstr ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paketas"
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid "Cannot create the folder:\n"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-#, fuzzy
-msgid "Component"
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
 msgstr ""
-"#-#-#-#-#  libk3b.po (libk3b)  #-#-#-#-#\n"
-"Komponentas\n"
-"#-#-#-#-#  umbrello.po (umbrello)  #-#-#-#-#\n"
-"#-#-#-#-#  kbugbuster.po (kbugbuster)  #-#-#-#-#\n"
-"#-#-#-#-#  kres_bugzilla.po (kres_bugzilla)  #-#-#-#-#\n"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
 msgstr ""
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Bendros parinktys"
+
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Sąsaja"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr ""
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
 msgstr ""
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: worktoolbar.cpp:275
-#, fuzzy
-msgid "Deep History"
-msgstr "Interneto istorija"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr ""
 
-#: worktoolbar.cpp:276
-#, fuzzy
-msgid "Shallow History"
-msgstr "Pokalbio istorija"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
 msgstr ""
 
-#: worktoolbar.cpp:278
+#: 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
 #, fuzzy
-msgid "Fork"
-msgstr "Dėl"
+msgid "Ready."
+msgstr "Pasirengęs."
 
-#: worktoolbar.cpp:279
+#: 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 "Junction"
-msgstr "Funkcija"
+msgid "Namespace"
+msgstr "Vardų zona"
 
-#: worktoolbar.cpp:280
+#: 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 "Klasė"
+
+#: codeimport/kdevcppparser/errors.cpp:23
 #, fuzzy
-msgid "Choice"
-msgstr "nurodyti"
+msgid "Internal Error"
+msgstr "Vidinė klaida"
 
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Aktyvumas sesijoje „%1“"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse 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/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Būsena"
+#: 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:1042 worktoolbar.cpp:288
-msgid "End Activity"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
 msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Pranešimas"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
 msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Žymėti"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name 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:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-#, fuzzy
-msgid "Paste Error"
-msgstr "Ádëti Klaida"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+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:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 msgstr ""
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 msgstr ""
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
 msgstr ""
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id 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:2374
+msgid "Class name expected"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
+#: 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:82 umldoc.cpp:1518
-msgid "UML Model"
+#: 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:106
-msgid "Logical View"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component 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 "&Savybės"
+
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: 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
+#, fuzzy, no-c-format
+msgid "General"
+msgstr "Bendra"
+
+#: 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 "Bendros savybės"
+
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
-"Dabartinė byla buvo pakeista.\n"
-"Ar norite ją išsaugoti?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: 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 "Įkėlimo klaida"
+#: 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 "Dokumentacija"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
+#: 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 "Šriftas:"
+
+#: 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 "Šriftų nustatymai"
+
+#: 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 "Spalva"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
 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/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+msgid "Delete"
 msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Pervadinti"
+
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
 msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, fuzzy, no-c-format
+msgid "Name:"
+msgstr "Vardas:"
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipas:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity 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
+#, fuzzy
+msgid "General Settings"
+msgstr "Bendrieji nustatymai"
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 msgstr ""
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-#, fuzzy
-msgid "Name"
-msgstr "Vardas"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+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:"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 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:70
+msgid "Role A Changeability"
 msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 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:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, no-c-format
+msgid "Rolename:"
 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:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, no-c-format
+msgid "Multiplicity:"
 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."
+#: 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 "Viešas"
+
+#: 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
+#, fuzzy, no-c-format
+msgid "Private"
+msgstr "Asmeninis"
+
+#: 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 ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Dokumentacija"
+
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
+#: 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 "Use Name"
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, no-c-format
+msgid "Add only"
 msgstr ""
-"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
-"Naudotojo vardas\n"
-"#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
-"Naudotojas\n"
-"#-#-#-#-#  tdepimresources.po (tdepimresources)  #-#-#-#-#\n"
-"Naudotojo vardas\n"
-"#-#-#-#-#  kres_groupwise.po (kres_groupwise)  #-#-#-#-#\n"
-"Naudotojo vardas\n"
-"#-#-#-#-#  tdeabc_slox.po (tdeabc_slox)  #-#-#-#-#\n"
-"Naudotojo vardas"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/classgenpage.cpp:50
 #, fuzzy
-msgid "Enter New Name"
+msgid "Class &name:"
+msgstr "Klasė vardas:"
+
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
 msgstr ""
-"#-#-#-#-#  libk3b.po (libk3b)  #-#-#-#-#\n"
-"#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
-"Bylos vardas"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
 msgstr ""
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
 msgstr ""
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
 msgstr ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
 msgstr ""
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
 msgstr ""
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
 msgstr ""
 
-#: umllistview.cpp:348
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:123
 #, fuzzy
-msgid "Externalize Folder"
-msgstr "Išorinė valdyklė"
+msgid "A&bstract use case"
+msgstr "Žymės &atributai"
 
-#: umllistview.cpp:416
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
 #, fuzzy
-msgid "Enter Model Name"
-msgstr "Įveskite aplanko vardą:"
+msgid "&Default"
+msgstr "Į&prastas"
 
-#: umllistview.cpp:417
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr ""
+
+#: 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 "&Viešas"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:186
 #, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "Įveskite naujo stiliaus pavadinimą:"
+msgid "Imple&mentation"
+msgstr "Dokumentacija"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vaizdai"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr ""
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
 msgstr ""
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 msgstr ""
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
 msgstr ""
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
 msgstr ""
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
 msgstr ""
 
-#: classifier.cpp:201
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Vardas nėra unikalus"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+#, fuzzy
+msgid "Attributes"
 msgstr ""
+"#-#-#-#-#  quanta.po (quanta)  #-#-#-#-#\n"
+"Žymės &atributai\n"
+"#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacijos"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Šablonai"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#: association.cpp:90
-msgid "Sequence Message"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+msgid "&Delete"
 msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Savybės"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Rodyti"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, fuzzy, no-c-format
-msgid "&New"
-msgstr "&Naujas"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr ""
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 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 "Dokumentacija"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, no-c-format
-msgid "Slash-Slash (//)"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Display"
+msgstr "Rodyti"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, no-c-format
-msgid "Slash-Star (/**  */)"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Stilius:"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+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:195
+msgid "Templates 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
-#, fuzzy, no-c-format
-msgid "General"
-msgstr "Bendra"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes 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:216
+msgid "Contents"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
-msgid "<p align=\"center\">String</p>"
+msgid "Code Generation Options"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/codegenerationwizard.cpp:120
+#, fuzzy
+msgid "Finish"
+msgstr "Baigti"
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
+"Duomenų bazės aplanko nėra:\n"
+"%1\n"
+"Ar norite jį dabar sukurti?"
 
-#. 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:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Aplankas neegzistuoja"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Sukurti aplanką"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "Nesirūpinti"
+
+#: dialogs/codegenerationwizard.cpp:168
+#, fuzzy
+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 ""
+"Ispell nepavyksta paleisti.\n"
+"Įsitikinkite, kad ispell yra teisingai sukonfigūruotas ir yra Jūsų kelyje "
+"PATH."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Spausdinti į bylą:"
+
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "Prašome nurodyti veiksmą."
+
+#: dialogs/codegenerationwizard.cpp:184
+#, fuzzy
+msgid ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
+"gocr egzistuoja, bet nėra vykdomoji byla.\n"
+"Pasitikrinkite savo įdiegimą ir (arba) įdiekite gocr teisingai."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "Bandant pervadinti aplanką %1 įvyko klaida"
+
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
+"Atrodo, kad „%1“ nėra aplankas.\n"
+"Prašome perkelti bylą, kad ji netrukdytų."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "Pasirinkite bylą"
+
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "Auto-Generate Methods"
+msgid "Code Viewer"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtras"
+
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
 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 "Viešas"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+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
-#, fuzzy, no-c-format
-msgid "Private"
-msgstr "Asmeninis"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+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"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: dialogs/diagramprintpage.cpp:65
+#, fuzzy
+msgid "Selection"
+msgstr "Pažymėjimas"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 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:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Būsena"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#, fuzzy
+msgid "Component"
 msgstr ""
+"#-#-#-#-#  libk3b.po (libk3b)  #-#-#-#-#\n"
+"Komponentas\n"
+"#-#-#-#-#  umbrello.po (umbrello)  #-#-#-#-#\n"
+"#-#-#-#-#  kbugbuster.po (kbugbuster)  #-#-#-#-#\n"
+"#-#-#-#-#  kres_bugzilla.po (kres_bugzilla)  #-#-#-#-#\n"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, fuzzy, no-c-format
-msgid "Hash (#)"
-msgstr "Danų (da)"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr ""
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Begin-End (=begin  =end)"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Žalia</p>"
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "Kalba"
+#: 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."
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Aplankai"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+#, fuzzy
+msgid "&Overwrite"
+msgstr "&Perrašyti"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Na&ršyti..."
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipas:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+#, fuzzy
+msgid "&Name:"
+msgstr "&Vardas:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"\"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 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, 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:"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 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/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Klausti"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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/settingsdlg.cpp:30
+msgid "Umbrello Setup"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface"
+msgstr "Naudotojo sąsaja"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatuojama"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, fuzzy, no-c-format
-msgid "Lines"
-msgstr "Linijos"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabuliacija"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Tarpas"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
 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:132
+msgid "E&nable autosave"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: 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 "Paleidimas"
+
+#: 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 ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
+#: dialogs/settingsdlg.cpp:183
+msgid "No 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:183
+msgid "Class 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 "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence 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 "Collaboration Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity 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:186
+msgid "Component Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
 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:210
+msgid "Class Settings"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
 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:221
+msgid "Show attributes"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Spalvos"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, fuzzy, no-c-format
-msgid "Font:"
-msgstr "Šriftas:"
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
-msgid "Selected:"
-msgstr "Pažymėtas:"
+msgid "Show operation signature"
+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:247
+msgid "Starting 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:252
+msgid "Default attribute scope:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, fuzzy, no-c-format
-msgid "Name:"
-msgstr "Vardas:"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Pirminė būsena"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+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:101
+msgid "State name:"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, fuzzy, no-c-format
-msgid "Show &grid"
-msgstr "Rodyti"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "Dokumentacija"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:163
 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."
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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:92
+msgid "Attributes:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
+#: 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
+#, fuzzy
+msgid "&None"
+msgstr "&Nieko"
+
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "Aplankai"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Sąrašas"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr ""
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr ""
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr ""
+
+#: 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 "Parametrai"
+
+#: 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 "Dokumentacija"
+#: 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 ""
 
-#: 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"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
 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"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
 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"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: 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:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</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: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"
+#: 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 "Įrašymo klaida"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
 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"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Atidaryti bylą"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:103
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 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"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
 msgstr ""
 
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#, fuzzy
+msgid "Name"
+msgstr "Vardas"
+
+#: 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 ""
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr ""
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr ""
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr ""
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "Bylos %1 nėra"
+
+#: 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 "Įkėlimo klaida"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Ši byla negali būti atidaryta."
+
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
 msgstr "Pakeisti šriftą"
@@ -1636,6 +1837,10 @@ msgstr ""
 msgid "Select Operation..."
 msgstr ""
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Keisti tekstą..."
@@ -1687,6 +1892,19 @@ msgstr "Naujas"
 msgid "Rename..."
 msgstr "Pervadinti..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Ádëti Klaida"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr ""
@@ -1718,14 +1936,26 @@ msgstr "Įdiegimo aplankas"
 msgid "Import Classes..."
 msgstr "I&mportuoti laiškus..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paketas"
+
 #: 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 ""
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1734,10 +1964,18 @@ msgstr ""
 msgid "Folder"
 msgstr "Aplankas"
 
+#: 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 ""
@@ -1774,6 +2012,18 @@ msgstr ""
 msgid "Export as Picture..."
 msgstr ""
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Sąsaja"
+
+#: 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 ""
@@ -1794,30 +2044,10 @@ msgstr ""
 msgid "Collaboration Diagram..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-#, fuzzy
-msgid "Attributes"
-msgstr ""
-"#-#-#-#-#  quanta.po (quanta)  #-#-#-#-#\n"
-"Žymės &atributai\n"
-"#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacijos"
-
 #: 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 ""
@@ -1830,11 +2060,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Rodyti"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1859,14 +2084,6 @@ msgstr ""
 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 "Spalva"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1895,10 +2112,26 @@ msgstr ""
 msgid "Package..."
 msgstr ""
 
+#: 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 ""
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr ""
@@ -1943,6 +2176,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 ""
@@ -1978,199 +2219,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
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Bylos %1 nėra"
-
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Ši byla negali būti atidaryta."
-
-#: _translatorinfo.cpp:1
-#, fuzzy
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "(niekas)"
-
-#: _translatorinfo.cpp:3
-#, fuzzy
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "(niekas)"
-
-#: 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
-#, fuzzy
-msgid "Ready."
-msgstr "Pasirengęs."
-
-#: 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 "Vardų zona"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-#, fuzzy
-msgid "Internal Error"
-msgstr "Vidinė klaida"
-
-#: 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 "Aplankai"
 
-#: 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 "Tuščia"
 
-#: 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
@@ -2185,100 +2329,65 @@ msgstr ""
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Bendros parinktys"
-
-#: 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"
-msgstr ""
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: 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
@@ -2436,11 +2545,6 @@ msgstr ""
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Eksportuoti kalendorių kaip žiniatinklio puslapį"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Savybės"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2525,14 +2629,21 @@ msgstr ""
 msgid "Opening file..."
 msgstr "Atidaroma byla..."
 
+#: 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 "Sukuriamas naujas dokumentas..."
 
 #: 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"
@@ -2559,12 +2670,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 "Perrašyti"
@@ -2600,8 +2719,8 @@ msgstr "Įterpamas talpyklės turinys..."
 
 #: 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
@@ -2656,1263 +2775,1245 @@ msgstr "Visos bylos"
 msgid "Select Code to Import"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:50
-#, fuzzy
-msgid "Class &name:"
-msgstr "Klasė vardas:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
+#: umldoc.cpp:108
+msgid "Component View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-#, fuzzy
-msgid "A&bstract use case"
-msgstr "Žymės &atributai"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Dabartinė byla buvo pakeista.\n"
+"Ar norite ją išsaugoti?"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-#, fuzzy
-msgid "&Default"
-msgstr "Į&prastas"
-
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Viešas"
-
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
+#: 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:182
-msgid "Pro&tected"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "Dokumentacija"
-
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
+#: umldoc.cpp:942
+msgid "state diagram"
 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:944
+msgid "activity diagram"
 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:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Vardas nėra unikalus"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
 msgstr ""
+"#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
+"Naudotojo vardas\n"
+"#-#-#-#-#  ppdtranslations.po (ppdtranslations)  #-#-#-#-#\n"
+"Naudotojas\n"
+"#-#-#-#-#  tdepimresources.po (tdepimresources)  #-#-#-#-#\n"
+"Naudotojo vardas\n"
+"#-#-#-#-#  kres_groupwise.po (kres_groupwise)  #-#-#-#-#\n"
+"Naudotojo vardas\n"
+"#-#-#-#-#  tdeabc_slox.po (tdeabc_slox)  #-#-#-#-#\n"
+"Naudotojo vardas"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Pervadinti"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
 msgstr ""
+"#-#-#-#-#  libk3b.po (libk3b)  #-#-#-#-#\n"
+"#-#-#-#-#  k3b.po (k3b)  #-#-#-#-#\n"
+"Bylos vardas"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 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
-#, fuzzy
-msgid "General Settings"
-msgstr "Bendrieji nustatymai"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 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 "Šriftų nustatymai"
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 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 "Bendros savybės"
-
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipas:"
+#: umllistview.cpp:348
+#, fuzzy
+msgid "Externalize Folder"
+msgstr "Išorinė valdyklė"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
+#: umllistview.cpp:416
 #, fuzzy
-msgid "&Name:"
-msgstr "&Vardas:"
+msgid "Enter Model Name"
+msgstr "Įveskite aplanko vardą:"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr ""
+#: umllistview.cpp:417
+#, fuzzy
+msgid "Enter the new name of the model:"
+msgstr "Įveskite naujo stiliaus pavadinimą:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr ""
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vaizdai"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter 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/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-#, fuzzy
-msgid "&None"
-msgstr "&Nieko"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Sąrašas"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Display"
-msgstr "Rodyti"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr ""
+msgid "Exporting view..."
+msgstr "Išeinama..."
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipas:"
-
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
+#: umlviewimageexporter.cpp:67
 #, fuzzy
-msgid "User Interface"
-msgstr "Naudotojo sąsaja"
+msgid "File Already Exists"
+msgstr "Byla jau yra"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
+#: 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:69
-msgid "De&fault Color"
+#: 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:73
-msgid "Line width:"
+#: worktoolbar.cpp:245
+msgid "Object"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr ""
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Antraštė"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr ""
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Pastaba"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:253
+msgid "Box"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: worktoolbar.cpp:257
+msgid "Relationship"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr ""
+#: worktoolbar.cpp:275
+#, fuzzy
+msgid "Deep History"
+msgstr "Interneto istorija"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr ""
+#: worktoolbar.cpp:276
+#, fuzzy
+msgid "Shallow History"
+msgstr "Pokalbio istorija"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:277
+msgid "Join"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Paleidimas"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr ""
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Dėl"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr ""
+#: worktoolbar.cpp:279
+#, fuzzy
+msgid "Junction"
+msgstr "Funkcija"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr ""
+#: worktoolbar.cpp:280
+#, fuzzy
+msgid "Choice"
+msgstr "nurodyti"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr ""
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "Aktyvumas sesijoje „%1“"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr ""
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Pranešimas"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr ""
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Žymėti"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Operacija"
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
+#: autolayout/newautolayoutdialog.ui:137
+#, no-c-format
+msgid "Ce&nter Diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Bendros parinktys"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
+#: autolayout/newautolayoutdialog.ui:238
+#, no-c-format
+msgid "Association as Ed&ges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Į&prastas"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stilius:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "Dokumentacija"
-
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametrai"
-
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Šablonai"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr ""
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, fuzzy, no-c-format
+msgid "Hash (#)"
+msgstr "Danų (da)"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr ""
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Žalia</p>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:69
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "Kalba"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Aplankai"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Na&ršyti..."
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:214
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Klausti"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: 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/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtras"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatuojama"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:284
+#, fuzzy, no-c-format
+msgid "Lines"
+msgstr "Linijos"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-#, fuzzy
-msgid "Selection"
-msgstr "Pažymėjimas"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabuliacija"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Tarpas"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: 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/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Pirminė būsena"
-
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
 msgstr ""
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Spalvos"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:72
+#, fuzzy, no-c-format
+msgid "Font:"
+msgstr "Šriftas:"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Pažymėtas:"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:120
-#, fuzzy
-msgid "Finish"
-msgstr "Baigti"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
 msgstr ""
-"Duomenų bazės aplanko nėra:\n"
-"%1\n"
-"Ar norite jį dabar sukurti?"
-
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Aplankas neegzistuoja"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Sukurti aplanką"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "Nesirūpinti"
+#: dialogs/diagrampropertiespage.ui:186
+#, fuzzy, no-c-format
+msgid "Show &grid"
+msgstr "Rodyti"
 
-#: dialogs/codegenerationwizard.cpp:168
-#, fuzzy
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
 msgstr ""
-"Ispell nepavyksta paleisti.\n"
-"Įsitikinkite, kad ispell yra teisingai sukonfigūruotas ir yra Jūsų kelyje PATH."
-
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Spausdinti į bylą:"
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "Prašome nurodyti veiksmą."
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
-#, fuzzy
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"gocr egzistuoja, bet nėra vykdomoji byla.\n"
-"Pasitikrinkite savo įdiegimą ir (arba) įdiekite gocr teisingai."
-
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Bandant pervadinti aplanką %1 įvyko klaida"
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
-"Atrodo, kad „%1“ nėra aplankas.\n"
-"Prašome perkelti bylą, kad ji netrukdytų."
 
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "Pasirinkite bylą"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: 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/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-#, fuzzy
-msgid "&Overwrite"
-msgstr "&Perrašyti"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
 msgstr ""
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "Aplankai"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
 msgstr ""
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr ""
+#: umbrelloui.rc:14
+#, fuzzy, no-c-format
+msgid "&New"
+msgstr "&Naujas"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
 msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Lygiuoti kairėje"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Lygiuoti dešinėje"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: umbrelloui.rc:35
+#, no-c-format
+msgid "&Zoom"
 msgstr ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
 msgstr ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Apsukti horizontaliai"
-
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Apsukti horizontaliai"
-
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Apsukti horizontaliai"
-
-#: aligntoolbar.cpp:383
+#: tips:3
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr ""
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+"<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 ""
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Išeinama..."
-
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: umlviewimageexporter.cpp:67
-#, fuzzy
-msgid "File Already Exists"
-msgstr "Byla jau yra"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr ""
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr ""
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr ""
-
-#: model_utils.cpp:250
-msgid "new_component"
+"<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:252
-msgid "new_node"
-msgstr ""
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr ""
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr ""
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr ""
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr ""
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr ""
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "Aplankai"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr ""
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Tuščia"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-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"
diff --git a/tde-i18n-mk/messages/tdesdk/umbrello.po b/tde-i18n-mk/messages/tdesdk/umbrello.po
index c49b709f469..039bd530d4b 100644
--- a/tde-i18n-mk/messages/tdesdk/umbrello.po
+++ b/tde-i18n-mk/messages/tdesdk/umbrello.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-09-30 17:38+0200\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -17,251 +17,212 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Автори на Umbrello UML Моделар"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Датотека за отворање"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 авторите на Umbrello UML Modeller"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-#, fuzzy
-msgid "Umbrello UML Modeller Authors"
-msgstr "Автори на Umbrello UML Моделар"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Илија Трајкоски"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Изнеси ги сите прикази..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "ile2807@gmail.com"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "При експортирање на сликите се случиа неколку грешки:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "Се појави проблем при зачувувањето на датотеката: %1"
+#: 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/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 "Грешка при зачувување"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Порамни лево"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Објект"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Порамни десно"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Синхронa порака"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Порамни на врв"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Асинхрона порака"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Порамни на дно"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Поврзување"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Порамни вертикално во средина"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Содржател"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Порамни хоризонтално во средина"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Сидро"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Порамни вертикално распределено"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Натпис"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Порамни хоризонтално распределено"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Забелешка"
+#: 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:253
-msgid "Box"
-msgstr "Кутија"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Форматирање"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Актер"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Зависност"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Генерализација"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Агрегација"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Релација"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Насочена асоцијација"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Имплементира (генерализација/реализација)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Композиција"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "Класа"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Иницијална состојба"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Крајна состојба"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Разгранување/Спојување"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Разделување/Спојување"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Пакет"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Компонента"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Јазол"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Зависност"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Артифакт"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Поврзување"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Интерфејс"
+#: association.cpp:88
+#, fuzzy
+msgid "Self Association"
+msgstr "Само-асоцијација"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Податочен тип"
+#: association.cpp:89
+#, fuzzy
+msgid "Collaboration Message"
+msgstr "Колаборациска порака"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Енумерација"
+#: association.cpp:90
+#, fuzzy
+msgid "Sequence Message"
+msgstr "Секвенцна порака"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Ентитет"
+#: association.cpp:91
+#, fuzzy
+msgid "Collaboration Self Message"
+msgstr "Колаборациска само-порака"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Долга историја"
+#: association.cpp:92
+#, fuzzy
+msgid "Sequence Self Message"
+msgstr "Секвенцна само-порака"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Кратка историја"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Содржател"
 
-#: worktoolbar.cpp:277
-#, fuzzy
-msgid "Join"
-msgstr "Спои"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Композиција"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Раздели"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Реализација"
 
-#: worktoolbar.cpp:279
+#: association.cpp:96
 #, fuzzy
-msgid "Junction"
-msgstr "Клучка"
+msgid "Uni Association"
+msgstr "Уни-Асоцијација"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Избор"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Сидро"
 
 #: association.cpp:98 worktoolbar.cpp:284
 #, fuzzy
 msgid "State Transition"
 msgstr "Пренос на состојба"
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Пренос на активност"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Активност"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Состојба"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Повеќекратност"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Крајна активност"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Внеси повеќекратност:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Иницијална активност"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Име на асоцијацијата"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Порака"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Внесете име на асоцијацијата:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "НЕДЕФИНИРАНО"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Име на улога"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Избери"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Внесете име на улога:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Ова не е валидно име."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Невалидно име"
+
+#: 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 "Името е веќе во употреба."
+
+#: 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 "Името не е единствено"
 
 #: 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."
+"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 ""
 "Барем еден од објектите во таблата со исечоци неможе да биде вметнат поради "
 "објект со истото име кое постои.  Сите останати објекти беа вметнати."
@@ -275,8 +236,8 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Не можам да ја отворам датотеката %1 за запишување. Осигурете се дека папката "
-"постои и дека имате дозвола за запишување."
+"Не можам да ја отворам датотеката %1 за запишување. Осигурете се дека "
+"папката постои и дека имате дозвола за запишување."
 
 #: codegenerator.cpp:473
 #, fuzzy
@@ -284,10 +245,8 @@ msgid "Cannot Open File"
 msgstr "Не можам да ја отворам датотеката"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Не можам да ја креирам папката:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Не можам да ја креирам папката:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -301,1306 +260,1546 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Не можам да ја креирам папката"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Внесете име на состојба"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Внесете име на нова состојба:"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Општи опции"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Внесете активност"
+#: codegenerators/cppcodegenerationform.cpp:38
+#, fuzzy
+msgid "Package is a namespace"
+msgstr "Пакетот е \"namespace\""
 
-#: 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 "Внесете го името за новата активност:"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Виртуелни уништувачи"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "нова активност"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Генерирај празни конструктори"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-Модел"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Генерирај пристапни методи"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Логички - поглед"
+#: codegenerators/cppcodegenerationform.cpp:50
+#, fuzzy
+msgid "Operations are inline"
+msgstr "Операциите се подредени"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Сценарио на употреба - поглед"
+#: codegenerators/cppcodegenerationform.cpp:53
+#, fuzzy
+msgid "Accessors are inline"
+msgstr "Пристапувачите се подредени"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Компонентен - поглед"
+#: codegenerators/cppcodegenerationform.cpp:57
+#, fuzzy
+msgid "Accessors are public"
+msgstr "Пристапувачите се јавни"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Поставување - поглед"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Внесувам датотека:%1, прогрес:%2/%3"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Модел на ентитет-релација"
+#: 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 "Подготвен."
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Типови на податоци"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Дали опфатот %1 е нејмспрејс или класа?"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
-"Тековната датотека е сменета.\n"
-"Дали сакате да ја зачувате?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Датотеката %1 не постои."
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Нејмспејс"
 
-#: 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 "Грешка при вчитувањето"
+#: 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 "Класа"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Изгледа дека датотеката %1 е оштетена."
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Внатрешна грешка"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Не беше пронајдена XMI-датотека во компресираната датотека %1."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Синтаксичка грешка пред %1"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Се појави грешка при вчитување на отпакуваната датотека: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Аналитичка грешка пред %1"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Се појави грешка при вчитувањето на датотеката: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Се појави грешка при качувањето на датотеката: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "очекуван израз"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "синтаксичка грешка при декларација"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Дијаграм на класи"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "очекувано } "
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "Дијаграм на секвенци"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "очекуван нејмспејс"
 
-#: umldoc.cpp:940
-#, fuzzy
-msgid "collaboration diagram"
-msgstr "Дијаграм на колаборација"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "очекуван {"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "Дијаграм на состојби"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Очекувано име на нејмспејс"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "Дијаграм на активности"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "Дијаграм на компоненти"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "очекувана декларација"
 
-#: umldoc.cpp:948
-#, fuzzy
-msgid "deployment diagram"
-msgstr "Дијаграм на поставување"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "Дијаграм на ентитет-релација"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+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 "Име"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "Внесете име:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Ова е невалидно име за дијаграм."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Невалидно име"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Веќе постои дијаграм со тоа име."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+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"
-msgstr "Името не е единствено"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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."
-msgstr "Ова не е валидно име."
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "Името е веќе во употреба."
+#: 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:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "очекуван исказ"
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
-"Внесеното име не е единствено.\n"
-"Дали тоа го сакавте?"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Името не е единствено"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Користи име"
+#: 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 "&Својства"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Внеси ново име"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Иницијална активност"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Дали навистина сакате да го избришете дијаграмот %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Крајна активност"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Бришење дијаграм"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Разгранување/Спојување"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Го поставувам документот..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Разделување/Спојување"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Разрешувам референци до објекти..."
+#: 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 "Општо"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Вчитувам UML-елементи..."
+#: 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 "Општи својства"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Вчитувам дијаграми..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Тип на активност:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Име на активност:"
+
+#: 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 "Документација"
+
+#: 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 "kde-uml-Diagram"
-msgstr "kde-uml-дијаграм"
+msgid "Font"
+msgstr "Фонт:"
 
-#: umldoc.cpp:2104
-#, fuzzy, c-format
-msgid "/autosave%1"
-msgstr "/автоматско зачувување%1"
+#: 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 "Поставувања за фонт"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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 "Боја"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Внесување име на модел"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Бои на графичка контрола"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Внесете го новото име на моделот:"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Активности"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Прегледи"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Нова активност..."
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Внесеното име е невалидно\n"
-"Процесот на креирање беше откажан."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Избриши котва"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Невалидно име"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Преименувај"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Внесеното име не е единствено!\n"
-"Процесот на креирање беше откажан."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Нова активност"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Креирањете е откажано"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "нова активност"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Вчитување на листа за преглед..."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Преименување активност"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Папката мора да е празна пред да се избрише."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Внесете го името за новата активност:"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Папката не е празна"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Име:"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Операцијата со истото име и потпис веќе постои. Не можете да го додадете уште "
-"еднаш."
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Тип:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Внесете име на актвност"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Асоцијации"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "нова состојба"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Својства на асоцијацијата"
 
-#: association.cpp:84
-msgid "Generalization"
-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 "Општи поставувања"
 
-#: association.cpp:88
-#, fuzzy
-msgid "Self Association"
-msgstr "Само-асоцијација"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Улоги"
 
-#: association.cpp:89
-#, fuzzy
-msgid "Collaboration Message"
-msgstr "Колаборациска порака"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Својства за улога"
 
-#: association.cpp:90
-#, fuzzy
-msgid "Sequence Message"
-msgstr "Секвенцна порака"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Фонт за асоцијација"
 
-#: association.cpp:91
-#, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Колаборациска само-порака"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Својства на улогата А"
 
-#: association.cpp:92
-#, fuzzy
-msgid "Sequence Self Message"
-msgstr "Секвенцна само-порака"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Својства на улогата Б"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Реализација"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Видливост на улогата А"
 
-#: association.cpp:96
-#, fuzzy
-msgid "Uni Association"
-msgstr "Уни-Асоцијација"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Видливост на улогата Б"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Менливост на улогата А"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Дијаграм"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Менливост на улогата Б"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&New"
-msgstr "&Нов"
+msgid "Rolename:"
+msgstr "Име на улога:"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Sh&ow"
-msgstr "&Прикажи"
+msgid "Multiplicity:"
+msgstr "Повеќекратност:"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Код"
+msgid "Public"
+msgstr "Јавно"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: 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 "Active &Language"
-msgstr "&Активен јазик"
+msgid "Private"
+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
+#: 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 "Documentation"
-msgstr "Документација"
+msgid "Protected"
+msgstr "Заштитено"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Slash-Slash (//)"
+msgid "Implementation"
+msgstr "Имплементација"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Slash-Star (/**  */)"
+msgid "Changeable"
+msgstr "Менливо"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Style:"
-msgstr "Стил:"
+msgid "Frozen"
+msgstr "Замрзнато"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ код генератор</p>"
+msgid "Add only"
+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 "Општо"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Име &на класата:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr "Генерација на метод на основа"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Име &на актерот:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Користете ги следните за класи во генерираниот код:"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Име &на пакетот:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Име &на сценариото на употреба:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "вектор"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Име &на интерфејсот:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Променлива</b>"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Име &на компонента:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Име &на артифакт:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Име &на енумератор:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "стринг"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Име &на типот на податоци:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Стринг</p>"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Име &на ентитет:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Листа</p>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Име на &стереотип:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Име &на пакет:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>глобално?</i>"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "А&пстрактна класа"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "А&пстрактно сценарио за употреба"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Име на класата"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Извршно"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Вклучи ја датотеката</p></i>"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Нацртај како"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Генерирање на проект"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Стандардно"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Креирај ANT документ"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Исполни:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Автоматски генерирај методи"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Биб&иотека"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Празни конструкторски методи"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Табела"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Генерирај асоцијациони методи"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Видливост"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Методи на атрибут акцесор"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+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 "Јавно"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+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 "Приватно"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+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 "Заштитено"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "И&мплементација"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Од обејктот родител"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Име на класа:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Стандарден атрибут за акцесор ...."
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Име на инстанца:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Нацртај како актер"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Повеќекратна инстанца"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Прикажи уништување"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Име на компонента:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Име на јазол:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
 msgstr ""
+"Името што го избравте\n"
+"веќе се користи\n"
+"Името беше ресетирано."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Од родителска улога"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Името не е единствено"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Јава генерирање код</p>"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Атрибути"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Хеш (#)"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Н&ов атрибут..."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Почеток-крај (=begin  =end)"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Операции"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Руби код генератор</p>"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Н&ова операција..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Шаблони"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Н&ов шаблон..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Нумерирани константи"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Н&ова енумерирана константа..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Атрибути на ентитетот"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Н&ов атрибут на ентитетот..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Избриши котва"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Својства"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Прикажување"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Опе&рации"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Видливост"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+#, fuzzy
+msgid "O&peration signature"
+msgstr "Потпис на о&перација"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Па&кет"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Ат&рибути"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Стерео&тип"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+#, fuzzy
+msgid "Attr&ibute signature"
+msgstr "Потпис на стер&еотип"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Нацртај како круг"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Приказ"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Опции за приказот"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Својства на атрибутот"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Својства на операцијата"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Својства на шаблонот"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Својства на енумерираните константи"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Својства на атрибутите на ентитетот"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Содржател"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Својства на содржината"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Асоцијации на класа"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "нова_класа"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Нова класа"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Атрибути на класа"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Операции на класа"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Опции за генерирање код"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Јазик"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Генерирај"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Датотеки"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Заврши"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Запиши ги сите генерирани датотеки во папката:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Кодот е генериран"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Прелистај..."
+#: dialogs/codegenerationwizard.cpp:134
+#, fuzzy
+msgid "Not Generated"
+msgstr "Не е генериран"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "П&релистај..."
+#: dialogs/codegenerationwizard.cpp:141
+#, fuzzy
+msgid "Not Yet Generated"
+msgstr "Сѐ уште не е генериран"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Вклучи ги заглавијата на датотеките од папката:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Папката %1 на постои. Дали сакате да ја креирате сега?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Датотеките кои се генерирани од код генераторот ќе бидат зачувани во оваа папка"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Излезната папка не постои"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Креирај папка"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Не креирај"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Датотеките во оваа папка ќе бидат користени како заглавија на датотеките во "
-"генерираниот код"
+"Папката не можеше да биде креирана.\n"
+"Проверете дали имате права за запишување до нејзината родителска папка или "
+"изберете друга папка."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Запиши врз политиката"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Грешка при креирањето на папката"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Изберете валидна папка."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Доколку датотеката со исто име како кодното име \n"
-"генераторот сака да ја користи како излезна датотека која веќе постои:"
+"Излезната датотека постои, но во неа не може да се запишува.\n"
+"Поставете ги соодветните дозволи или изберете друга папка."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Презапиши"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "Запиши врз датотеките кои веќе постојат во одредената папка"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "Изгледа дека %1 не е папка. Изберете валидна папка."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Прашај"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Изберете валидна папка"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Доколку постои датотека со исто име, прашај што да се прави"
+msgid "Code Viewer"
+msgstr "Прегледувач за код"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Користи различно име"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Нема достапни опции.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Дијаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Форматирање"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Филтер"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Линии"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Тековен дијаграм"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Стил на завршување на линијата:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Сите диј&аграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Вид на идентитет:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "И&збери дијаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Вредност на идентитетот:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Тип на дијаграм"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Избор"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Сценарио на употреба"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+#, fuzzy
+msgid "Collaboration"
+msgstr "Колаборација"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+#, fuzzy
+msgid "Sequence"
+msgstr "Серија"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Состојба"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Компонента"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "Поставување"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-дијаграм"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Нема избрани дијаграми."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Формат во кој ќе бидат изнесени датотеките"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Документација за белешката"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Одредишната датотека веќе постои"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Датотеката %1 веќе постои во %2.\n"
+"\n"
+"Umbrello може да запише врз датотеката, да генерира слично\n"
+"слично име или да не ја генерира датотеката."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "Примени н&а сите останати датотеки"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Без идентификација"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Запиши"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Ливче"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Генерирај слично име"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Место"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Не генерирај &датотека"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr ""
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+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"
-msgstr "Запиши "
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Тип:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Име:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Иницијална вредност:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Насока на поминување"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Запиши коментари кои индицираат различни секции (јавни, приватни и сл.) во "
-"класата, дури иако е празна"
+"„in“ е параметар само за читање, „out“ е параметар само за запишување и "
+"„inout“ е параметар за читање и запишување."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "З&апиши ги коментарите од документацијата иако е празна"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr "Запиши коментар за класите и методите во документот иако е празен"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+#, fuzzy
+msgid "Select Operation"
+msgstr "Избирање операција"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Јазични опции"
+#: dialogs/selectopdlg.cpp:43
+#, fuzzy
+msgid "Sequence number:"
+msgstr "Број од серијата:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Волшебник за генерирање на код"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Класна операција:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Избери класи"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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:30
+msgid "Umbrello Setup"
+msgstr "Поставување на Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Кориснички интерфејс"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Поставувања на кориснички интерфејс"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Боја на линија:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Стандардна б&оја"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Боја на исполнување:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Стандардна б&оја"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Дебелина на линија:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "С&тандардна дебелина"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "Користи боја на исполн&ување"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Стави ги сите класи во кои сакате да се генерира код\n"
-"за во десната страна на листата"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Додај класа за генерација на код"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Овозможи отповикување"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Избрани класи"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Користи дијаграми со ливчиња"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Отстрани ја класата од кодот за генерирање"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Користи ги новите генератори за C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Достапни класи"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Користи аголни линии за асоцијации"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Состојба на генерирање на код"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Автоматско зачувување"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Притиснете на генералното копче за да започнете со генерирање на код"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Овозможи а&втоматсо зачувување"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Состојба на генерирање"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Временски интервал за зачувување (минути):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Прегледувач за код"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Наставка за автом. зачувување:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Прикажи скриени блокови"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Датотеката за автоматско зачувување ќе биде зачувана во ~/autosave."
+"xmi ако автоматското зачувување се случи пред да ја зачувате Вашата датотека "
+"рачно.</p><p>Ако веќе ја имате зачувано Вашата датотека, датотеката за "
+"автоматско зачувување ќе биде зачувана во истата папка и ќе биде именувана "
+"со истото име и наведената наставка.</p><p>Ако наведената наставка е иста со "
+"наставката од Вашата датотека, автоматското зачувување ќе запише врз Вашата "
+"датотека.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">овде името на компонентата</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Почеток"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Прикажи вид на блок"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Поч&етно лого"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Бои"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "Сове&т на денот"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Фонт:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Вчитај го пос&ледниот проект"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Хартија:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Почни нов проект со:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Избрано:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Без дијаграм"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML објектен блок:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Класен дијаграм"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Скриен блок:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Дијаграм за сценарио на употреба"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Неуредувачки текст:</p>"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Sequence Diagram"
+msgstr "Секвенцен дијаграм"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Уредувачки текст:</p>"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "Collaboration Diagram"
+msgstr "Колаборациски дијаграм"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Својства на дијаграм"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Дијаграм на состојби"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Име:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Дијаграм на активности"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Фокусирање:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Дијаграм на компоненти"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+#, fuzzy
+msgid "Deployment Diagram"
+msgstr "Дијаграм на поставување"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Својства на класа"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Прикажи &видливост"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Прикажи атрибути"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Прикажи операции"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Прикажи стереот&ип"
+
+#: dialogs/settingsdlg.cpp:233
+#, fuzzy
+msgid "Show attribute signature"
+msgstr "Прикажи потпис на атрибут"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Прикажи пакет"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
 msgid "Show operation signature"
 msgstr "Прикажи потпис на операција"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Прикажи &мрежа"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Почетен опсег"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Прикачи за мрежа"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Стандарден опсег на атрибут:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Префрлисе на големината на компонентата"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+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."
-msgstr ""
-"Префрли се на компонентата за да биде поставена во мрежа.\n"
-"Доколку „Прилепи на мрежа“ е овозможено, компонентата секогаш ќе биде порамнета "
-"со мрежата од сите 4 страни."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Генерирање код"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Растојание на мрежата:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Поставувања за генерирање код"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Поставувања за прегледувачот на код"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Иницијална состојба"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Ширина на линија:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Крајна состојба"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Изнеси ги сите прикази"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Тип на состојба:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Папка во која се зачувуваат дијаграмите:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+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"
-msgstr "Основната папка за зачувување на слики"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Боја на графичка контрола"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Тип на &слика:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+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"
-msgstr "Формат во кој ќе бидат изнесени датотеките"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Опсег на кла&сификатор („static“)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "&Користи папки"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Јавен"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Во означената папка креирај ја истата структура на стебло која\n"
-"се користи во документот за зачувување на прегледот"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Заштит&ен"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, fuzzy, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "И&мплементација"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Внесовте невалидно име за атрибутот."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Невалидно име за атрибут"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Погледите се зачувани во папките во документот. Истата структура на стебло, "
-"која се користи во документот да се зачува погледот може да биде направена "
-"базна папка со оваа опција.\n"
-"Само папките креирани од корисникот се прикажуваат во почетната папка (логички "
-"поглед, употреби „Case“ поглед)"
+"The attribute name you have chosen 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"
-msgstr "Својства на улогата"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute 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:"
-msgstr "Име на улога:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Својства на атрибутот на ентитетот"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Повеќекратност:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Стан&дардна вредност:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Можност за променување на улогата"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Должина/вредности:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Само за додавање"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Автоматско зголемување"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Замрзнато"
+#: dialogs/umlentityattributedialog.cpp:88
+#, fuzzy
+msgid "Allow &null"
+msgstr "Дозволи &null"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Менливо"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Атрибути:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Можност за гледање на улогата"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Индексирање"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Имплементација"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Примарен"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Индекс"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Внесовте невалидно име за атрибут на ентитетот."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Невалидно име на атрибут на ентитетот"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Името на атрибутот на ентитетот што го избравте веќе се користи од оваа "
+"операција."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name 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"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Својства на операцијата"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Апстрактна операција"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Прашање („const“)"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Параметри"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Нов парам&етар..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Внесовте погрешно име за параметарот."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Невалидно име на параметар"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
+"Името на параметарот што го избравте\n"
+"веќе се користи од оваа операција."
 
-#: tips.txt:91
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Името на параметарот не е единствено"
+
+#: dialogs/umloperationdialog.cpp:406
 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"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
+"Името на параметарот што го избравте веќе се користи од оваа операција."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Внесовте невалидно име за операцијата."
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Невалидно име на операција"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#, fuzzy
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Операција со тој потпис веќе постои во %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Изберете друго име или листа на параметри."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Својства на улогата"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Својства на шаблонот"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Внесовте невалидно име за шаблон."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Невалидно име за шаблон"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Името за параметарот за шаблонот што го внесовте веќе се користи во оваа "
+"операција."
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Името на шаблонот не е единствено"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Опции за приказ на класите"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Бои на дијаграм"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Името што го внесовте не е валидно."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Името што го внесовте не е единствено."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Името не е единствено"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Линија:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Исполни:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Стан&дардно"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Користи исполнување"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Изнеси ги сите прикази..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+msgstr "Се појави проблем при зачувувањето на датотеката: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Грешка при зачувување"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Автори на Umbrello UML Моделар"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Датотека за отворање"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>Со Ctrl+A можете да си изберете сите објекти</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 авторите на Umbrello UML Modeller"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+#, fuzzy
+msgid "Umbrello UML Modeller Authors"
+msgstr "Автори на Umbrello UML Моделар"
+
+#: 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 "Име"
+
+#: 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 "Внесете име:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Внесете име на операција:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Внесете нов текст:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ГРЕШКА"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Изменете текст"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "Датотечната папка %1 не постои."
+
+#: 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 "Грешка при вчитувањето"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Датотечната папка %1 неможе да се отвори."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1654,6 +1853,10 @@ msgstr "Нова операција..."
 msgid "Select Operation..."
 msgstr "Измебери операција..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Измени текст..."
@@ -1705,6 +1908,19 @@ msgstr "Нов"
 msgid "Rename..."
 msgstr "Преименувај..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Грешка при вметнувањето"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Боја на линија..."
@@ -1733,14 +1949,26 @@ msgstr ""
 msgid "Import Classes..."
 msgstr "Внеси класи..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Пакет"
+
 #: 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 "Јазол"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Дијаграм на поставување..."
@@ -1749,10 +1977,18 @@ msgstr "Дијаграм на поставување..."
 msgid "Folder"
 msgstr "Папка"
 
+#: 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 "Употреби дијаграм..."
@@ -1789,6 +2025,18 @@ msgstr "Нов атрибут на ентитетот..."
 msgid "Export as Picture..."
 msgstr "Изнеси како слика..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Интерфејс"
+
+#: 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 "Дијаграм на класи..."
@@ -1809,26 +2057,10 @@ msgstr "Дијаграм на секвенци..."
 msgid "Collaboration Diagram..."
 msgstr "Дијаграм на сооднос..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Атрибути"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Операции"
-
 #: 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 "Потпис на операција"
@@ -1841,11 +2073,6 @@ msgstr "Потпис на атрибут"
 msgid "Stereotype"
 msgstr "Стереотип"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Прикажување"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Атрибут..."
@@ -1870,14 +2097,6 @@ msgstr "Боја на исполнување"
 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 "Боја"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Актер..."
@@ -1906,10 +2125,26 @@ msgstr "Енумерација..."
 msgid "Package..."
 msgstr "Пакет..."
 
+#: 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 "Состојба..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Иницијална активност"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Крајна активност"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Подсистем..."
@@ -1954,6 +2189,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 "Избриши дијаграм"
@@ -1989,196 +2232,108 @@ 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 "(c) 2001 Paul Hensgen, (c) 2002-2006 авторите на Umbrello UML Modeller"
 
-#: 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
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Датотечната папка %1 не постои."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Датотечната папка %1 неможе да се отвори."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Илија Трајкоски"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "ile2807@gmail.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 "Подготвен."
-
-#: 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 "Дали опфатот %1 е нејмспрејс или класа?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Нејмспејс"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Внесувам датотека:%1, прогрес:%2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Внатрешна грешка"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Синтаксичка грешка пред %1"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Аналитичка грешка пред %1"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<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"
-msgstr "очекуван израз"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "ново_сценарио_употреба"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "синтаксичка грешка при декларација"
+#: 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"
-msgstr "очекувано } "
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "нова_компонента"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "очекуван нејмспејс"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "нов_јазол"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "очекуван {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "нов_артифакт"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Очекувано име на нејмспејс"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "нов_интерфејс"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "нов_тип_податок"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "очекувана декларација"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "нова_енумерација"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+#: 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 "нов_јазол"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "недостига }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "нова_асоцијација"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: 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 "Празно"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "очекуван идентификувач"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Погрешно формиран аргумент"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Непознат тип на аргумент"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "очекувано име на класа"
+#: 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"
-msgstr "очекуван услов"
+#: model_utils.cpp:561
+#, fuzzy
+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"
-msgstr "очекуван исказ"
+#: 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"
-msgstr ""
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Резервиран збор"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2192,110 +2347,66 @@ msgstr "Внесете ново име на објектот:"
 msgid "new_parameter"
 msgstr "нов_параметар"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Општи опции"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "Пакетот е \"namespace\""
-
-#: 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
-#, fuzzy
-msgid "Operations are inline"
-msgstr "Операциите се подредени"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-#, fuzzy
-msgid "Accessors are inline"
-msgstr "Пристапувачите се подредени"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-#, fuzzy
-msgid "Accessors are public"
-msgstr "Пристапувачите се јавни"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Дијаграм: %2 страница %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Внесете име на дијаграм"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Додај основна класа"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Внесете ново име на дијаграмот:"
+#: 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?"
-msgstr "Дали сте сигурни дека сакате да го избришете целиот дијаграм?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Додај операција"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Отстранете го дијаграмот?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Додај атрибут"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Преименувањето е откажано"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Додај основен интерфејс"
 
-#: umllistviewitem.cpp:468
-#, fuzzy
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
-"Преименувањето на предметот %1 во листирачки преглед сѐ уште не е "
-"имплементирано."
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Функцијата не е имплементирана"
+#: 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 ""
-"Името што го внесовте не е валидно.\n"
-"Процесот на преименување е откажан."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "нова_асоцијација"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Внесете име на состојба"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "нов_атрибут"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Внесете име на нова состојба:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "нов_образец"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Внесете активност"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "нова_операција"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Неточно употребени асоцијации."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "нов_литерал"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Грешка при асоцијацијата"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "ново_поле"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "нова состојба"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2451,11 +2562,6 @@ msgstr "И&знеси како слика..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Из&неси ги сите дијаграми како слики..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Својства"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Зголемувачки лизгач"
@@ -2540,21 +2646,28 @@ msgstr "Документација"
 msgid "Opening file..."
 msgstr "Отворам датотека..."
 
+#: 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 "Создавам нов документ..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Сите поддржани датотеки (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Сите поддржани датотеки (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Некомпресирани XMI Files (*.xmi)\n"
 "*.xmi.tgz|Gzip Компресирани XMI датотеки (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 Компресирани XMI датотеки (*.xmi.tar.bz2)\n"
@@ -2584,6 +2697,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 компресирана XMI датотека\n"
 "*|Сите датотеки"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2592,6 +2709,10 @@ msgstr ""
 "Датотеката %1 веќе постои.\n"
 "Дали сакате да запишете врз неа."
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Презапиши"
@@ -2627,8 +2748,8 @@ msgstr "Ја вметнувам содржината на таблата со и
 
 #: 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 ""
 "Umbrello неможе да ја вметни содржината од таблата со исечоци.  Објектите од "
 "таблата со исечоци можат да бидат од погрешен вид и да бидат вметнати овде."
@@ -2686,1284 +2807,1260 @@ msgstr "Сите датотеки"
 msgid "Select Code to Import"
 msgstr "Изберете код за внесување"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Име &на класата:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Име &на актерот:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "нов_атрибут"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Име &на пакетот:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "нов_образец"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Име &на сценариото на употреба:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "нова_операција"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Име &на интерфејсот:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "нов_литерал"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Име &на компонента:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "ново_поле"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Име &на артифакт:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-Модел"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Име &на енумератор:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Логички - поглед"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Име &на типот на податоци:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Сценарио на употреба - поглед"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Име &на ентитет:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Компонентен - поглед"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Име на &стереотип:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Поставување - поглед"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Име &на пакет:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Модел на ентитет-релација"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "А&пстрактна класа"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Типови на податоци"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "А&пстрактно сценарио за употреба"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Тековната датотека е сменета.\n"
+"Дали сакате да ја зачувате?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Извршно"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Датотеката %1 не постои."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Нацртај како"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Изгледа дека датотеката %1 е оштетена."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Стандардно"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Не беше пронајдена XMI-датотека во компресираната датотека %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Биб&иотека"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Се појави грешка при вчитување на отпакуваната датотека: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Табела"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Се појави грешка при вчитувањето на датотеката: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Јавен"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Се појави грешка при качувањето на датотеката: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "П&риватен"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Заш&титен"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Дијаграм на класи"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "И&мплементација"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "Дијаграм на секвенци"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Име на класа:"
+#: umldoc.cpp:940
+#, fuzzy
+msgid "collaboration diagram"
+msgstr "Дијаграм на колаборација"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Име на инстанца:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "Дијаграм на состојби"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Нацртај како актер"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "Дијаграм на активности"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Повеќекратна инстанца"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "Дијаграм на компоненти"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Прикажи уништување"
+#: umldoc.cpp:948
+#, fuzzy
+msgid "deployment diagram"
+msgstr "Дијаграм на поставување"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Име на компонента:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "Дијаграм на ентитет-релација"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Име на јазол:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Ова е невалидно име за дијаграм."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Име на стереотипот:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Веќе постои дијаграм со тоа име."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Името што го избравте\n"
-"веќе се користи\n"
-"Името беше ресетирано."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Името не е единствено"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Линија:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Исполни:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Стан&дардно"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Користи исполнување"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Активности"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Нова активност..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Преименувај"
+"Внесеното име не е единствено.\n"
+"Дали тоа го сакавте?"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Нова активност"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Користи име"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Преименување активност"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Внеси ново име"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Внесете го името за новата активност:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Дали навистина сакате да го избришете дијаграмот %1?"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Својства на асоцијацијата"
+#: umldoc.cpp:1099
+msgid "Delete 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 "Општи поставувања"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Го поставувам документот..."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Улоги"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Разрешувам референци до објекти..."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Својства за улога"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Вчитувам UML-елементи..."
 
-#: 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 "Поставувања за фонт"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Вчитувам дијаграми..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Фонт за асоцијација"
+#: umldoc.cpp:2104
+#, fuzzy, c-format
+msgid "/autosave%1"
+msgstr "/автоматско зачувување%1"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Својства на шаблонот"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+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 "Општи својства"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Внесување име на модел"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Тип:"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Внесете го новото име на моделот:"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Име:"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Прегледи"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Внесовте невалидно име за шаблон."
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Внесеното име е невалидно\n"
+"Процесот на креирање беше откажан."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Невалидно име за шаблон"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Невалидно име"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
-"Името за параметарот за шаблонот што го внесовте веќе се користи во оваа "
-"операција."
+"Внесеното име не е единствено!\n"
+"Процесот на креирање беше откажан."
 
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Името на шаблонот не е единствено"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Креирањете е откажано"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Својства на атрибутот на ентитетот"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Вчитување на листа за преглед..."
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Стан&дардна вредност:"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Папката мора да е празна пред да се избрише."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Должина/вредности:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Папката не е празна"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Автоматско зголемување"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Преименувањето е откажано"
 
-#: dialogs/umlentityattributedialog.cpp:88
+#: umllistviewitem.cpp:468
 #, fuzzy
-msgid "Allow &null"
-msgstr "Дозволи &null"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Атрибути:"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Индексирање"
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Нема"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Примарен"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Индекс"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Единствен"
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Внесовте невалидно име за атрибут на ентитетот."
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Преименувањето на предметот %1 во листирачки преглед сѐ уште не е "
+"имплементирано."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Невалидно име на атрибут на ентитетот"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Функцијата не е имплементирана"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistviewitem.cpp:478
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Името на атрибутот на ентитетот што го избравте веќе се користи од оваа "
-"операција."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Името на атрибутот на ентитетот не е единствено"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Приказ"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Опции за приказ на класите"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Бои на дијаграм"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Името што го внесовте не е валидно."
-
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Името што го внесовте не е единствено."
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Тип:"
-
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Поставување на Umbrello"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Кориснички интерфејс"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Поставувања на кориснички интерфејс"
-
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Боја на линија:"
-
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Стандардна б&оја"
-
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Боја на исполнување:"
+"Името што го внесовте не е валидно.\n"
+"Процесот на преименување е откажан."
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Стандардна б&оја"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Дијаграм: %2 страница %1"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Дебелина на линија:"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Внесете име на дијаграм"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "С&тандардна дебелина"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Внесете ново име на дијаграмот:"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "Користи боја на исполн&ување"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr "Дали сте сигурни дека сакате да го избришете целиот дијаграм?"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Овозможи отповикување"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Отстранете го дијаграмот?"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Користи дијаграми со ливчиња"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Изнесување на погледот..."
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Користи ги новите генератори за C++/Java/Ruby"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Се појави грешка при изнесувањето на сликата:\n"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Користи аголни линии за асоцијации"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Избраната датотека %1 постои.\n"
+"Дали сакате да запишете врз неа?"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Автоматско зачувување"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Датотеката веќе постои"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Овозможи а&втоматсо зачувување"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Не можам да ја креирам папката: %1"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Временски интервал за зачувување (минути):"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Не можам да зачувам празен дијаграм"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Наставка за автом. зачувување:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Се појави проблем при зачувувањето на дијаграмот во %1"
 
-#: dialogs/settingsdlg.cpp:148
+#: umlwidgetcontroller.cpp:128
 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>"
-msgstr ""
-"<qt>"
-"<p>Датотеката за автоматско зачувување ќе биде зачувана во ~/autosave.xmi ако "
-"автоматското зачувување се случи пред да ја зачувате Вашата датотека рачно.</p>"
-"<p>Ако веќе ја имате зачувано Вашата датотека, датотеката за автоматско "
-"зачувување ќе биде зачувана во истата папка и ќе биде именувана со истото име и "
-"наведената наставка.</p>"
-"<p>Ако наведената наставка е иста со наставката од Вашата датотека, "
-"автоматското зачувување ќе запише врз Вашата датотека.</p></qt>"
-
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Почеток"
+"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:164
-msgid "Sta&rtup logo"
-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 ""
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "Сове&т на денот"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Објект"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Вчитај го пос&ледниот проект"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Синхронa порака"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Почни нов проект со:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Асинхрона порака"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Без дијаграм"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Натпис"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Класен дијаграм"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Забелешка"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Дијаграм за сценарио на употреба"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Кутија"
 
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Sequence Diagram"
-msgstr "Секвенцен дијаграм"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Релација"
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "Collaboration Diagram"
-msgstr "Колаборациски дијаграм"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Насочена асоцијација"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Дијаграм на состојби"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Имплементира (генерализација/реализација)"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Дијаграм на активности"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Долга историја"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Дијаграм на компоненти"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Кратка историја"
 
-#: dialogs/settingsdlg.cpp:187
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Deployment Diagram"
-msgstr "Дијаграм на поставување"
-
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Својства на класа"
-
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Прикажи &видливост"
-
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Прикажи атрибути"
-
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Прикажи операции"
+msgid "Join"
+msgstr "Спои"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Прикажи стереот&ип"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Раздели"
 
-#: dialogs/settingsdlg.cpp:233
+#: worktoolbar.cpp:279
 #, fuzzy
-msgid "Show attribute signature"
-msgstr "Прикажи потпис на атрибут"
-
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Прикажи пакет"
-
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Почетен опсег"
-
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Стандарден опсег на атрибут:"
+msgid "Junction"
+msgstr "Клучка"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Стандарден опсег на операција:"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Избор"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Генерирање код"
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "Пренос на активност"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Поставувања за генерирање код"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Порака"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Поставувања за прегледувачот на код"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "НЕДЕФИНИРАНО"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Својства на операцијата"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Избери"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Апстрактна операција"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Опсег на кла&сификатор („static“)"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Прашање („const“)"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Заштит&ен"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "И&мплементација"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Прикажи операции"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Параметри"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Нов парам&етар..."
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Избриши дијаграм"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Внесовте погрешно име за параметарот."
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Невалидно име на параметар"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Генерализација"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
-"Името на параметарот што го избравте\n"
-"веќе се користи од оваа операција."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-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 "Внесовте невалидно име за операцијата."
-
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Невалидно име на операција"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Име на асоцијацијата"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-#, fuzzy
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
-"Операција со тој потпис веќе постои во %1.\n"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Изберете друго име или листа на параметри."
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Својства на улогата А"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Својства на улогата Б"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Стандардно"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Видливост на улогата А"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Видливост на улогата Б"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-Slash (//)"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Менливост на улогата А"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-Star (/**  */)"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Менливост на улогата Б"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Стил:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Содржани елементи"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ код генератор</p>"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Документација за белешката"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Генерација на метод на основа"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Н&ов атрибут..."
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Користете ги следните за класи во генерираниот код:"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Н&ова операција..."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Шаблони"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "вектор"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Н&ов шаблон..."
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Променлива</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..."
-msgstr "Н&ова енумерирана константа..."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Атрибути на ентитетот"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "стринг"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Н&ов атрибут на ентитетот..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Стринг</p>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Иницијална активност"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Листа</p>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Крајна активност"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Тип на активност:"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>глобално?</i>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Име на активност:"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Бои на графичка контрола"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Име на класата"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Својства на атрибутот"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Вклучи ја датотеката</p></i>"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Иницијална вредност:"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Генерирање на проект"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Јавен"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Креирај ANT документ"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Внесовте невалидно име за атрибутот."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Автоматски генерирај методи"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Невалидно име за атрибут"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Празни конструкторски методи"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Името на атрибутот што го избравте веќе се користи од оваа операција."
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Генерирај асоцијациони методи"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Името на атрибутот не е единствено"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Методи на атрибут акцесор"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "Избирање операција"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Од обејктот родител"
 
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "Број од серијата:"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Стандарден атрибут за акцесор ...."
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Класна операција:"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Сопствена операција:"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Од родителска улога"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Дијаграми"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Јава генерирање код</p>"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Филтер"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Хеш (#)"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Тековен дијаграм"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Почеток-крај (=begin  =end)"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Сите диј&аграми"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Руби код генератор</p>"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "И&збери дијаграми"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Јазик"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Тип на дијаграм"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Датотеки"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Избор"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Запиши ги сите генерирани датотеки во папката:"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-#, fuzzy
-msgid "Collaboration"
-msgstr "Колаборација"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Прелистај..."
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-#, fuzzy
-msgid "Sequence"
-msgstr "Серија"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "П&релистај..."
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "Поставување"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Вклучи ги заглавијата на датотеките од папката:"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Нема избрани дијаграми."
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Датотеките кои се генерирани од код генераторот ќе бидат зачувани во оваа "
+"папка"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Опции за приказот"
+#: 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:179
-msgid "Attribute Settings"
-msgstr "Својства на атрибутот"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Запиши врз политиката"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Својства на операцијата"
+#: 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 ""
+"Доколку датотеката со исто име како кодното име \n"
+"генераторот сака да ја користи како излезна датотека која веќе постои:"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Својства на шаблонот"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Презапиши"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Својства на енумерираните константи"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Запиши врз датотеките кои веќе постојат во одредената папка"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Својства на атрибутите на ентитетот"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Прашај"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Својства на содржината"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Доколку постои датотека со исто име, прашај што да се прави"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Асоцијации"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Користи различно име"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Асоцијации на класа"
+#: 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:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Опе&рации"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Форматирање"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Видливост"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Линии"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr "Потпис на о&перација"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Стил на завршување на линијата:"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Па&кет"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Вид на идентитет:"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Ат&рибути"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Вредност на идентитетот:"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Стерео&тип"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-#, fuzzy
-msgid "Attr&ibute signature"
-msgstr "Потпис на стер&еотип"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Нацртај како круг"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Иницијална состојба"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Без идентификација"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Крајна состојба"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Ливче"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Тип на состојба:"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Место"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Име на состојба:"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Боја на графичка контрола"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Запиши "
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "нова_класа"
+#: 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/classwizard.cpp:54
-msgid "New Class"
-msgstr "Нова класа"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "З&апиши ги коментарите од документацијата иако е празна"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Атрибути на класа"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Запиши коментар за класите и методите во документот иако е празен"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Операции на класа"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Јазични опции"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Својства на параметарот"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Волшебник за генерирање на код"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Насока на поминување"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Избери класи"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
-"„in“ е параметар само за читање, „out“ е параметар само за запишување и „inout“ "
-"е параметар за читање и запишување."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Генерирај"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Заврши"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Кодот е генериран"
+"Стави ги сите класи во кои сакате да се генерира код\n"
+"за во десната страна на листата"
 
-#: dialogs/codegenerationwizard.cpp:134
-#, fuzzy
-msgid "Not Generated"
-msgstr "Не е генериран"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Додај класа за генерација на код"
 
-#: dialogs/codegenerationwizard.cpp:141
-#, fuzzy
-msgid "Not Yet Generated"
-msgstr "Сѐ уште не е генериран"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Избрани класи"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Папката %1 на постои. Дали сакате да ја креирате сега?"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Отстрани ја класата од кодот за генерирање"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Излезната папка не постои"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Достапни класи"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Креирај папка"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Состојба на генерирање на код"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Не креирај"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Притиснете на генералното копче за да започнете со генерирање на код"
 
-#: 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 ""
-"Папката не можеше да биде креирана.\n"
-"Проверете дали имате права за запишување до нејзината родителска папка или "
-"изберете друга папка."
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Состојба на генерирање"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Грешка при креирањето на папката"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Прикажи скриени блокови"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Изберете валидна папка."
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">овде името на компонентата</p>"
 
-#: 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/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
-"Излезната датотека постои, но во неа не може да се запишува.\n"
-"Поставете ги соодветните дозволи или изберете друга папка."
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Грешка при запишувањето во излезната папка"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "Изгледа дека %1 не е папка. Изберете валидна папка."
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Изберете валидна папка"
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Одредишната датотека веќе постои"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+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."
-msgstr ""
-"Датотеката %1 веќе постои во %2.\n"
-"\n"
-"Umbrello може да запише врз датотеката, да генерира слично\n"
-"слично име или да не ја генерира датотеката."
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Бои"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "Примени н&а сите останати датотеки"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Фонт:"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Запиши"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Хартија:"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Генерирај слично име"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Избрано:"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Не генерирај &датотека"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML објектен блок:</p>"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Нема достапни опции.</p>"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Скриен блок:</p>"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Повеќекратност"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Неуредувачки текст:</p>"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Внеси повеќекратност:"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Уредувачки текст:</p>"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Име на асоцијацијата"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Својства на дијаграм"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Внесете име на асоцијацијата:"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Фокусирање:"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Име на улога"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Внесете име на улога:"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Прикажи &мрежа"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Внесете име на операција:"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Прикачи за мрежа"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Внесете нов текст:"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Префрлисе на големината на компонентата"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ГРЕШКА"
+#: 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 ""
+"Префрли се на компонентата за да биде поставена во мрежа.\n"
+"Доколку „Прилепи на мрежа“ е овозможено, компонентата секогаш ќе биде "
+"порамнета со мрежата од сите 4 страни."
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Изменете текст"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Растојание на мрежата:  "
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Порамни лево"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Порамни десно"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Порамни на врв"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Ширина на линија:  "
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Порамни на дно"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Изнеси ги сите прикази"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Порамни вертикално во средина"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Папка во која се зачувуваат дијаграмите:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Порамни хоризонтално во средина"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Основната папка за зачувување на слики"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Порамни вертикално распределено"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Тип на &слика:"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Порамни хоризонтално распределено"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "&Користи папки"
 
-#: aligntoolbar.cpp:383
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"За порамнување мора да изберете најмалку два објекти како на пример класи или "
-"актери. Не може да порамнувате асоцијации."
+"Во означената папка креирај ја истата структура на стебло која\n"
+"се користи во документот за зачувување на прегледот"
 
-#: object_factory.cpp:164
+#: dialogs/exportallviewsdialogbase.ui:107
+#, fuzzy, no-c-format
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"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 ""
-"Ова е резервиран збор од програмскиот јазик кој е конфигуриран за генераторот "
-"на код."
+"Погледите се зачувани во папките во документот. Истата структура на стебло, "
+"која се користи во документот да се зачува погледот може да биде направена "
+"базна папка со оваа опција.\n"
+"Само папките креирани од корисникот се прикажуваат во почетната папка "
+"(логички поглед, употреби „Case“ поглед)"
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Резервиран збор"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Можност за променување на улогата"
 
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Изнесување на погледот..."
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Можност за гледање на улогата"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
-"Се појави грешка при изнесувањето на сликата:\n"
 
-#: umlviewimageexporter.cpp:66
-msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Избраната датотека %1 постои.\n"
-"Дали сакате да запишете врз неа?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Датотеката веќе постои"
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "нов_актер"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "ново_сценарио_употреба"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "нов_пакет"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "нова_компонента"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "нов_јазол"
+#: 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 "&Нов"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "нов_интерфејс"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Прикажи"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "нов_тип_податок"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Фокусирање:"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "нова_енумерација"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Код"
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "нов_ентитет"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Активен јазик"
 
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "нов_јазол"
+#: 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"
-msgstr "нов_објект"
+#: 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 "Празно"
+#: 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"
-msgstr "Погрешно формиран аргумент"
+#: 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"
-msgstr "Непознат тип на аргумент"
+#: 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"
-msgstr "Нелегално име на метод"
+#: 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
-#, fuzzy
-msgid "Unknown return type"
-msgstr "Непознат повратен тип"
+#: 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"
-msgstr "Неодредена грешка"
+#: 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"
-msgstr "Додај основна класа"
+#: 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"
-msgstr "Додај операција"
+#: 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"
-msgstr "Додај атрибут"
+#: 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"
-msgstr "Додај основен интерфејс"
+#: 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"
-msgstr "Не можам да ја креирам папката: %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"
-msgstr "Не можам да зачувам празен дијаграм"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Со Ctrl+A можете да си изберете сите објекти</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Се појави проблем при зачувувањето на дијаграмот во %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 "new_stereotype"
 #~ msgstr "нов_стереотип"
diff --git a/tde-i18n-ms/messages/tdesdk/umbrello.po b/tde-i18n-ms/messages/tdesdk/umbrello.po
index 9e6298c3e97..20d9dbc8369 100644
--- a/tde-i18n-ms/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ms/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2008-02-18 20:43+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -13,269 +13,218 @@ 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 "Sharuzzaman Ahmat Raslan"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Simpan ke fail"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sharuzzaman@myrealbox.com"
 
-#: docgenerators/main.cpp:48
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
 #, fuzzy
-msgid "The XSLT file to use"
-msgstr "Fail untuk menyimpan suntingan:"
+msgid "Enter Activity Name"
+msgstr "Tetap Nama Imej"
 
-#: 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
+#: aligntoolbar.cpp:40
 #, fuzzy
-msgid "Umbrello UML Modeller Authors"
-msgstr "Fail Pemodel Umbrello UML"
+msgid "Align Left"
+msgstr "Jajar kiri perenggan"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#: aligntoolbar.cpp:41
 #, fuzzy
-msgid "Exporting all views..."
-msgstr "(Semua rujukan kelihatan)"
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-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"
-msgstr ""
+msgid "Align Right"
+msgstr "Jajar kanan perenggan"
 
-#: 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
+#: aligntoolbar.cpp:42
 #, fuzzy
-msgid "Save Error"
-msgstr "Ralat KMail"
+msgid "Align Top"
+msgstr "Margin Atas [%s]"
 
-#: worktoolbar.cpp:245
+#: aligntoolbar.cpp:43
 #, fuzzy
-msgid "Object"
-msgstr "Salin Objek"
+msgid "Align Bottom"
+msgstr "Margin Bawah [%s]"
 
-#: worktoolbar.cpp:246
+#: aligntoolbar.cpp:44
 #, fuzzy
-msgid "Synchronous Message"
-msgstr "Mesej Emel"
+msgid "Align Vertical Middle"
+msgstr "Pisah di Pertengahan"
 
-#: worktoolbar.cpp:247
+#: aligntoolbar.cpp:45
 #, fuzzy
-msgid "Asynchronous Message"
-msgstr "Mesej Emel"
-
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr ""
-
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr ""
+msgid "Align Horizontal Middle"
+msgstr "Pisah di Pertengahan"
 
-#: association.cpp:97 worktoolbar.cpp:250
+#: aligntoolbar.cpp:46
 #, fuzzy
-msgid "Anchor"
-msgstr "Sauh notaakhir"
-
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Label"
+msgid "Align Vertical Distribute"
+msgstr "Jajar-tengah perenggan"
 
-#: worktoolbar.cpp:252
+#: aligntoolbar.cpp:47
 #, fuzzy
-msgid "Note"
-msgstr "&Notakaki"
+msgid "Align Horizontal Distribute"
+msgstr "Jajar-tengah perenggan"
 
-#: worktoolbar.cpp:253
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+
+#: aligntoolbar.cpp:384
 #, fuzzy
-msgid "Box"
-msgstr "Kotak Senarai"
+msgid "Information"
+msgstr "Memformat"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
 msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
+#: association.cpp:84
+msgid "Generalization"
 msgstr ""
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr ""
 
-#: worktoolbar.cpp:257
-#, fuzzy
-msgid "Relationship"
-msgstr "Kaitan:"
-
-#: worktoolbar.cpp:258
-#, fuzzy
-msgid "Directional Association"
-msgstr "Pilihan Dua-Arah"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
 msgstr ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-#, fuzzy
-msgid "Use Case"
-msgstr "&Padan huruf"
-
-#. 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 "Kelas"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-#, fuzzy
-msgid "Initial State"
-msgstr "Caps Permulaan"
+#: association.cpp:88
+msgid "Self Association"
+msgstr ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#: association.cpp:89
 #, fuzzy
-msgid "End State"
-msgstr "Letak di penghujung dokumen"
+msgid "Collaboration Message"
+msgstr "Mesej Emel"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+#: association.cpp:90
 #, fuzzy
-msgid "Branch/Merge"
-msgstr "Gabung &Mel"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr ""
+msgid "Sequence Message"
+msgstr "Mesej Emel"
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+#: association.cpp:91
 #, fuzzy
-msgid "Package"
-msgstr "Pelihat Pakej"
+msgid "Collaboration Self Message"
+msgstr "Mesej Berita Usenet"
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#: association.cpp:92
 #, fuzzy
-msgid "Component"
-msgstr "Pemilih Komponen"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr ""
+msgid "Sequence Self Message"
+msgstr "Mesej Berita Usenet"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-#, fuzzy
-msgid "Interface"
-msgstr "Antaramuka Pengguna"
-
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
 msgstr ""
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: association.cpp:95
+msgid "Realization"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: worktoolbar.cpp:275
-#, fuzzy
-msgid "Deep History"
-msgstr "Sejarah &Dokumen"
-
-#: worktoolbar.cpp:276
+#: association.cpp:97 worktoolbar.cpp:250
 #, fuzzy
-msgid "Shallow History"
-msgstr "Sejarah &Dokumen"
-
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr ""
-
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr ""
-
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
-
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+msgid "Anchor"
+msgstr "Sauh notaakhir"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr ""
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr ""
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
 msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
 #, fuzzy
-msgid "End Activity"
-msgstr "Letak di penghujung dokumen"
+msgid "Enter multiplicity:"
+msgstr "Masukkan Katalaluan"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#: associationwidget.cpp:2346
 #, fuzzy
-msgid "Initial Activity"
-msgstr "Caps Permulaan"
+msgid "Association Name"
+msgstr "Nama Medan"
 
-#: worktoolbar.cpp:290
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 #, fuzzy
-msgid "Message"
-msgstr "Mesej Emel"
+msgid "Enter association name:"
+msgstr "Tetap Nama Imej"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: associationwidget.cpp:2366
+#, fuzzy
+msgid "Role Name"
+msgstr "Nama Medan"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+#, fuzzy
+msgid "Enter role name:"
+msgstr "Tetap Nama Imej"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: worktoolbar.cpp:302
+#: 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 ""
+
+#: 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
 #, fuzzy
-msgid "Select"
-msgstr "Pilih"
+msgid "Invalid Name"
+msgstr "Nama Medan"
+
+#: 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 ""
+
+#: 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
+#, fuzzy
+msgid "Not a Unique Name"
+msgstr "Tetap Nama Imej"
 
 #: 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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -296,8 +245,7 @@ msgstr "Tak dapat membuka fail %s."
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
 #, fuzzy
-msgid ""
-"Cannot create the folder:\n"
+msgid "Cannot create the folder:\n"
 msgstr "Wizard Folder Rangkaian"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
@@ -311,1307 +259,1693 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Wizard Folder Rangkaian"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#: codegenerators/cppcodegenerationform.cpp:36
 #, fuzzy
-msgid "Enter State Name"
-msgstr "Tetap Nama Imej"
+msgid "General Options"
+msgstr "Pilihan Bina"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:38
+#, fuzzy
+msgid "Package is a namespace"
+msgstr "Fail Pakej RPM"
 
-#: statewidget.cpp:176
+#: codegenerators/cppcodegenerationform.cpp:41
 #, fuzzy
-msgid "Enter Activity"
-msgstr "Masukkan Katalaluan"
+msgid "Virtual destructors"
+msgstr "Pengurus Mesin Maya"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
+#: codegenerators/cppcodegenerationform.cpp:44
+#, fuzzy
+msgid "Generate empty constructors"
+msgstr "Cipta dokumen kosong"
+
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
+#: codegenerators/cppcodegenerationform.cpp:50
 #, fuzzy
-msgid "new activity"
-msgstr "&Tetingkap Baru"
+msgid "Operations are inline"
+msgstr "Apakah ini?"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: codegenerators/cppcodegenerationform.cpp:53
 #, fuzzy
-msgid "UML Model"
-msgstr "Model Pencetak"
+msgid "Accessors are inline"
+msgstr "Apakah ini?"
 
-#: umldoc.cpp:106
+#: codegenerators/cppcodegenerationform.cpp:57
 #, fuzzy
-msgid "Logical View"
-msgstr "Lihat Normal"
+msgid "Accessors are public"
+msgstr "Apakah ini?"
 
-#: umldoc.cpp:107
+#: codeimport/classimport.cpp:34
 #, fuzzy
-msgid "Use Case View"
-msgstr "Lihat sejarah dokumen"
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Ralat mengimport fail %s"
 
-#: umldoc.cpp:108
+#: 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 ""
+
+#: 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
+msgid "Namespace"
+msgstr ""
+
+#: 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 "Kelas"
+
+#: codeimport/kdevcppparser/errors.cpp:23
 #, fuzzy
-msgid "Component View"
-msgstr "Lihat Normal"
+msgid "Internal Error"
+msgstr "Ralat KMail"
 
-#: umldoc.cpp:109
+#: codeimport/kdevcppparser/errors.cpp:24
 #, fuzzy
-msgid "Deployment View"
-msgstr "Lihat Normal"
+msgid "Syntax Error before '%1'"
+msgstr "Ralat sintaks API Skype"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/kdevcppparser/errors.cpp:25
+#, fuzzy
+msgid "Parse Error before '%1'"
+msgstr "12 pt sebelum"
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+#, fuzzy
+msgid "expression expected"
+msgstr "Penyunting Ungkapan Nalar (regexp)"
+
+#: codeimport/kdevcppparser/parser.cpp:598
+#, fuzzy
+msgid "Declaration syntax error"
+msgstr "Ralat sintaks API Skype"
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
 msgstr ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
 msgstr ""
 
-#: umldoc.cpp:355
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
 #, fuzzy
-msgid "The file %1 does not exist."
-msgstr "Tak dapat membuka fail %s."
+msgid "Namespace name expected"
+msgstr "Tetap Nama Imej"
 
-#: 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
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
 #, fuzzy
-msgid "Load Error"
-msgstr "Ralat KMail"
+msgid "Constant expression expected"
+msgstr "Penyunting Ungkapan Nalar (regexp)"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 msgstr ""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 msgstr ""
 
-#: umldoc.cpp:934
-#, fuzzy
-msgid "use case diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
 
-#: umldoc.cpp:936
+#: codeimport/kdevcppparser/parser.cpp:2337
 #, fuzzy
-msgid "class diagram"
-msgstr "Kelas Pencetak"
+msgid "Type id expected"
+msgstr "Jenis Senarai Semasa"
 
-#: umldoc.cpp:938
+#: codeimport/kdevcppparser/parser.cpp:2374
 #, fuzzy
-msgid "sequence diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+msgid "Class name expected"
+msgstr "Tetap Nama Imej"
 
-#: umldoc.cpp:940
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2705
 #, fuzzy
-msgid "collaboration diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+msgid "for initialization expected"
+msgstr "&Cari Bantuan"
 
-#: umldoc.cpp:942
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
+
+#: 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 "state diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+msgid "Properties"
+msgstr "Ciri-ciri Dokumen"
 
-#: umldoc.cpp:944
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "activity diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+msgid "Initial activity"
+msgstr "Caps Permulaan"
 
-#: umldoc.cpp:946
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "component diagram"
-msgstr "Pemilih Komponen"
+msgid "End activity"
+msgstr "Letak di penghujung dokumen"
 
-#: umldoc.cpp:948
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
 #, fuzzy
-msgid "deployment diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+msgid "Branch/Merge"
+msgstr "Gabung &Mel"
 
-#: umldoc.cpp:950
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr ""
+
+#: 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 "Umum"
+
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
 #, fuzzy
-msgid "entity relationship diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+msgid "General Properties"
+msgstr "Ciri-ciri Dokumen"
 
-#: 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 "Nama"
+#: dialogs/activitydialog.cpp:82
+#, fuzzy
+msgid "Activity type:"
+msgstr "Jenis per&nomboran:"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#: dialogs/activitydialog.cpp:87
 #, fuzzy
-msgid "Enter name:"
+msgid "Activity name:"
 msgstr "Nama Medan"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr ""
+#: 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
+#, fuzzy, no-c-format
+msgid "Documentation"
+msgstr "Dokumentasi"
 
-#: 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
+#: 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 "Invalid Name"
-msgstr "Nama Medan"
+msgid "Font"
+msgstr "Font:"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-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
+#, fuzzy
+msgid "Font Settings"
+msgstr "Seting Fon"
 
-#: 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
+#: 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
 #, fuzzy
-msgid "Not a Unique Name"
-msgstr "Tetap Nama Imej"
+msgid "Color"
+msgstr "Warna"
 
-#: 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/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+#, fuzzy
+msgid "Widget Colors"
+msgstr "%1 (widget tersendiri)"
 
-#: 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 ""
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+#, fuzzy
+msgid "Activities"
+msgstr "Aktiviti penapis &log"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
+#: dialogs/activitypage.cpp:72
+#, fuzzy
+msgid "New Activity..."
+msgstr "&Tetingkap Baru"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid "Name Not Unique"
-msgstr "Fail %s tidak dijumpai"
+msgid "Delete"
+msgstr "Sauh notaakhir"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
 #, fuzzy
-msgid "Use Name"
-msgstr "Nama Medan"
+msgid "Rename"
+msgstr "Tukar nama"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/activitypage.cpp:134
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Tetap Nama Imej"
+msgid "New Activity"
+msgstr "&Tetingkap Baru"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+#, fuzzy
+msgid "new activity"
+msgstr "&Tetingkap Baru"
+
+#: dialogs/activitypage.cpp:153
+#, fuzzy
+msgid "Rename Activity"
+msgstr "Tukarnama Halaman %1 ke %2"
+
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: umldoc.cpp:1099
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nama:"
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Jenis:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr ""
+
+#: dialogs/assocpropdlg.cpp:39
 #, fuzzy
-msgid "Delete Diagram"
-msgstr "Pa&dam hiperlink"
+msgid "Association Properties"
+msgstr "Ciri-ciri Dokumen"
 
-#: umldoc.cpp:1573
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
 #, fuzzy
-msgid "Setting up the document..."
-msgstr "Cipta dokumen baru"
+msgid "General Settings"
+msgstr "Tetapan Semasa"
 
-#: umldoc.cpp:1600
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr ""
+
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "Resolving object references..."
-msgstr "Salin Objek Embed"
+msgid "Role Settings"
+msgstr "Tetapan Semasa"
 
-#: umldoc.cpp:1638
+#: dialogs/assocpropdlg.cpp:112
 #, fuzzy
-msgid "Loading UML elements..."
-msgstr "Memuatkan Clip Art"
+msgid "Association font"
+msgstr "Font Semasa"
 
-#: umldoc.cpp:1811
+#: dialogs/assocrolepage.cpp:50
 #, fuzzy
-msgid "Loading diagrams..."
-msgstr "Memuatkan Clip Art"
+msgid "Role A Properties"
+msgstr "Ciri-ciri Dokumen"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#: dialogs/assocrolepage.cpp:51
 #, fuzzy
-msgid "kde-uml-Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+msgid "Role B Properties"
+msgstr "Ciri-ciri Dokumen"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: umllistview.cpp:348
-#, fuzzy
-msgid "Externalize Folder"
-msgstr "Folder Rumah"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr ""
 
-#: umllistview.cpp:416
-#, fuzzy
-msgid "Enter Model Name"
-msgstr "Tetap Nama Imej"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr ""
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, no-c-format
+msgid "Multiplicity:"
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-#, fuzzy
-msgid "Name Not Valid"
-msgstr "Fail %s tidak dijumpai"
+#: 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
+#, fuzzy, no-c-format
+msgid "Public"
+msgstr "Awam"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: 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 ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
+#: 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 ""
 
-#: umllistview.cpp:2338
-#, fuzzy
-msgid "Loading listview..."
-msgstr "Memuatkan Clip Art"
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, no-c-format
+msgid "Implementation"
+msgstr ""
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: umllistview.cpp:2671
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, no-c-format
+msgid "Frozen"
+msgstr ""
+
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, fuzzy, no-c-format
+msgid "Add only"
+msgstr "T_ambah Semua"
+
+#: dialogs/classgenpage.cpp:50
 #, fuzzy
-msgid "Folder Not Empty"
-msgstr "Cipta dokumen kosong"
+msgid "Class &name:"
+msgstr "Nama Medan"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
+#: dialogs/classgenpage.cpp:52
+#, fuzzy
+msgid "Actor &name:"
+msgstr "Nama Medan"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#: dialogs/classgenpage.cpp:54
 #, fuzzy
-msgid "Enter Activity Name"
+msgid "Package &name:"
+msgstr "Nama Medan"
+
+#: dialogs/classgenpage.cpp:56
+#, fuzzy
+msgid "Use case &name:"
 msgstr "Tetap Nama Imej"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
+#: dialogs/classgenpage.cpp:58
 #, fuzzy
-msgid "new state"
-msgstr "&Tetingkap Baru"
+msgid "Interface &name:"
+msgstr "Nama Medan"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr ""
+#: dialogs/classgenpage.cpp:60
+#, fuzzy
+msgid "Component &name:"
+msgstr "Nama Medan"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr ""
+#: dialogs/classgenpage.cpp:62
+#, fuzzy
+msgid "Artifact &name:"
+msgstr "Nama Medan"
 
-#: association.cpp:89
+#: dialogs/classgenpage.cpp:64
 #, fuzzy
-msgid "Collaboration Message"
-msgstr "Mesej Emel"
+msgid "Enum &name:"
+msgstr "Nama Medan"
 
-#: association.cpp:90
+#: dialogs/classgenpage.cpp:66
 #, fuzzy
-msgid "Sequence Message"
-msgstr "Mesej Emel"
+msgid "Datatype &name:"
+msgstr "Nama Medan"
 
-#: association.cpp:91
+#: dialogs/classgenpage.cpp:68
 #, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Mesej Berita Usenet"
+msgid "Entity &name:"
+msgstr "Nama Medan"
 
-#: association.cpp:92
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
 #, fuzzy
-msgid "Sequence Self Message"
-msgstr "Mesej Berita Usenet"
+msgid "&Stereotype name:"
+msgstr "Nama Medan"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr ""
+#: dialogs/classgenpage.cpp:107
+#, fuzzy
+msgid "&Package name:"
+msgstr "Nama Medan"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr ""
+#: dialogs/classgenpage.cpp:121
+#, fuzzy
+msgid "A&bstract class"
+msgstr "Kelas Pencetak"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, fuzzy, no-c-format
-msgid "&Export"
-msgstr "Eksport Fail"
+#: dialogs/classgenpage.cpp:123
+#, fuzzy
+msgid "A&bstract use case"
+msgstr "Senarai Huruf Kecil"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "&Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
+#: dialogs/classgenpage.cpp:131
+#, fuzzy
+msgid "&Executable"
+msgstr "Fail Boleh Laksana"
+
+#: dialogs/classgenpage.cpp:138
+#, fuzzy
+msgid "Draw As"
+msgstr "Mempuny&ai label"
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Default"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
 #, fuzzy, no-c-format
-msgid "&New"
-msgstr "&Baru"
+msgid "&File"
+msgstr "Gaya pengisian:"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
+#: dialogs/classgenpage.cpp:149
+#, fuzzy
+msgid "&Library"
+msgstr "Perkongsian Pustaka"
+
+#: dialogs/classgenpage.cpp:152
+#, fuzzy
+msgid "&Table"
+msgstr "&Jadual"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "&Code"
-msgstr "Kod Objek"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr ""
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Active &Language"
-msgstr "Tetapan bahasa"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+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
-#, fuzzy, no-c-format
-msgid "Documentation"
-msgstr "Dokumentasi"
+#: dialogs/classgenpage.cpp:182
+#, fuzzy
+msgid "Pro&tected"
+msgstr "Dokumen Quattro Pro"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, no-c-format
-msgid "Slash-Slash (//)"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, fuzzy, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Senarai Bintang"
+#: dialogs/classgenpage.cpp:256
+#, fuzzy
+msgid "Class name:"
+msgstr "Nama Medan"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, fuzzy, no-c-format
-msgid "Style:"
-msgstr "Gaya:"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#, fuzzy
+msgid "Instance name:"
+msgstr "Nama Medan"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+#: dialogs/classgenpage.cpp:272
+#, fuzzy
+msgid "Draw as actor"
+msgstr "&Simpan Imej Sebagai"
+
+#: dialogs/classgenpage.cpp:277
+#, fuzzy
+msgid "Multiple instance"
+msgstr "Berbilang Desktop"
+
+#: dialogs/classgenpage.cpp:284
+#, fuzzy
+msgid "Show destruction"
+msgstr "Papar &Sejarah"
+
+#: dialogs/classgenpage.cpp:322
+#, fuzzy
+msgid "Component name:"
+msgstr "Nama Medan"
+
+#: dialogs/classgenpage.cpp:324
+#, fuzzy
+msgid "Node name:"
+msgstr "Nama Medan"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+#, fuzzy
+msgid "Stereotype name:"
+msgstr "Nama Medan"
+
+#: 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 ""
 
-#. 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 "Umum"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+#, fuzzy
+msgid "Name is Not Unique"
+msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "vector"
-msgstr "Grafik boleh Skala Vektor"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classifierlistpage.cpp:45
+#, fuzzy
+msgid "N&ew Template..."
+msgstr "Buka Template"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "Jajar-tengah perenggan"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "Jajar-tengah perenggan"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Sauh notaakhir"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+#, fuzzy
+msgid "&Properties"
+msgstr "Ciri-ciri Dokumen"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+#, fuzzy
+msgid "Show"
+msgstr "Papar"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+#, fuzzy
+msgid "O&peration signature"
+msgstr "Editor Tandatangan"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Class name"
-msgstr "Nama Medan"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Project Generation"
-msgstr "Projek Fedora"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+#, fuzzy
+msgid "Attr&ibute signature"
+msgstr "Lekang Tandatangan OpenPGP"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Cipta dokumen kosong baru"
+#: dialogs/classoptionspage.cpp:108
+#, fuzzy
+msgid "Draw as circle"
+msgstr "&Simpan Imej Sebagai"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, fuzzy, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Auto-kesan kemera"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Display"
+msgstr "Paparan"
+
+#: dialogs/classpropdlg.cpp:118
+#, fuzzy
+msgid "Display Options"
+msgstr "Pilihan Bina"
+
+#: dialogs/classpropdlg.cpp:179
+#, fuzzy
+msgid "Attribute Settings"
+msgstr "Tetapan Semasa"
+
+#: dialogs/classpropdlg.cpp:187
+#, fuzzy
+msgid "Operation Settings"
+msgstr "Tetapan Semasa"
+
+#: dialogs/classpropdlg.cpp:195
+#, fuzzy
+msgid "Templates Settings"
+msgstr "Tetapan Semasa"
+
+#: dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals Settings"
+msgstr "Ubah seting latar belakang"
+
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "Ubah seting latar belakang"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Tetapan Semasa"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents Settings"
+msgstr "Tetapan Semasa"
+
+#: dialogs/classpropdlg.cpp:222
+#, fuzzy
+msgid "Class Associations"
+msgstr "Kelas Pencetak"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#, fuzzy
+msgid "new_class"
+msgstr "Kelas Pencetak"
+
+#: dialogs/classwizard.cpp:54
+#, fuzzy
+msgid "New Class"
+msgstr "Kelas Pencetak"
+
+#: dialogs/classwizard.cpp:59
+#, fuzzy
+msgid "Class Attributes"
+msgstr "Kelas Pencetak"
+
+#: dialogs/classwizard.cpp:63
+#, fuzzy
+msgid "Class Operations"
+msgstr "Kelas Pencetak"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, fuzzy, no-c-format
-msgid "Empty constructor methods"
-msgstr "Cipta dokumen kosong"
+msgid "Code Generation Options"
+msgstr "Pilihan Dua-Arah"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:120
+#, fuzzy
+msgid "Finish"
+msgstr "Selesai "
 
-#. 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
-#, fuzzy, no-c-format
-msgid "Public"
-msgstr "Awam"
+#: dialogs/codegenerationwizard.cpp:132
+#, fuzzy
+msgid "Code Generated"
+msgstr "Kod Objek"
 
-#. 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"
+#: dialogs/codegenerationwizard.cpp:134
+#, fuzzy
+msgid "Not Generated"
+msgstr "Tiada"
+
+#: dialogs/codegenerationwizard.cpp:141
+#, fuzzy
+msgid "Not Yet Generated"
+msgstr "Fail %s tidak dijumpai"
+
+#: 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 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"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Amaran: tandabuku yang anda berikan [%s] tidak wujud."
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Folder Rumah"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "Cipta dokumen baru"
+
+#: 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 144
-#: rc.cpp:129 rc.cpp:186
-#, fuzzy, no-c-format
-msgid "From Parent Object"
-msgstr "Salin Objek Embed"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Wizard Folder Rangkaian"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: 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 198
-#: rc.cpp:147 rc.cpp:204
-#, fuzzy, no-c-format
-msgid "From Parent Role"
-msgstr "Selit MathML dari fail"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "Ralat menulis ketika cuba menyimpan %s"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, fuzzy, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Letak di penghujung dokumen"
+msgid "Code Viewer"
+msgstr "Pemapar DjVu"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, fuzzy, no-c-format
-msgid "Code Generation Options"
-msgstr "Pilihan Dua-Arah"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Bahasa"
+#: dialogs/diagramprintpage.cpp:40
+#, fuzzy
+msgid "Filter"
+msgstr "<b>Menerapkan tindakan penapis:</b> "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, fuzzy, no-c-format
-msgid "Folders"
-msgstr "Cari Fail/Folder"
+#: dialogs/diagramprintpage.cpp:48
+#, fuzzy
+msgid "&Current diagram"
+msgstr "Tarikh Semasa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:53
+#, fuzzy
+msgid "&All diagrams"
+msgstr "Aba&i Semua"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
+#: dialogs/diagramprintpage.cpp:57
+#, fuzzy
+msgid "&Select diagrams"
+msgstr "Pilih &semakan"
+
+#: dialogs/diagramprintpage.cpp:61
+#, fuzzy
+msgid "&Type of diagram"
+msgstr "Jenis per&nomboran:"
+
+#: dialogs/diagramprintpage.cpp:65
+#, fuzzy
+msgid "Selection"
+msgstr "Pilihan"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+#, fuzzy
+msgid "Use Case"
+msgstr "&Padan huruf"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#, fuzzy
+msgid "Component"
+msgstr "Pemilih Komponen"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
+
+#: dialogs/diagramprintpage.cpp:135
+#, fuzzy
+msgid "No diagrams selected."
+msgstr "Tiada plugin dipilih"
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid ""
-"Files in this folder will be used as heading files in the generated code"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, fuzzy, no-c-format
-msgid "Overwrite Policy"
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "Dokumentasi Fedora"
+
+#: dialogs/overwritedialogue.cpp:27
+#, fuzzy
+msgid "Destination File Already Exists"
 msgstr "Fail telah wujud.  Tulisganti fail '%s'?"
 
-#. 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"
+#: 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 ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, fuzzy, no-c-format
-msgid "As&k"
-msgstr "Mempuny&ai label"
-
-#. 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/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, fuzzy, no-c-format
-msgid "&Use a different name"
-msgstr "Simpan dokumen dengan nama lain"
+#: dialogs/overwritedialogue.cpp:40
+#, fuzzy
+msgid "&Do Not Generate File"
+msgstr "Tak dapat membuka fail %s."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:35
+#, fuzzy
+msgid "Parameter Properties"
+msgstr "Ciri-ciri Dokumen"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+#, fuzzy
+msgid "&Type:"
+msgstr "Jenis"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+#, fuzzy
+msgid "&Name:"
+msgstr "&Nama:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+#, fuzzy
+msgid "&Initial value:"
+msgstr "Nilai Notaakhir permulaan"
+
+#: dialogs/parmpropdlg.cpp:82
+#, fuzzy
+msgid "Passing Direction"
+msgstr "Penan&da Arah"
+
+#: 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"
-msgstr "Memformat"
+#: dialogs/pkgcontentspage.cpp:29
+#, fuzzy
+msgid "Contained Items"
+msgstr "&Pilih Item Baru"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, fuzzy, no-c-format
-msgid "Lines"
-msgstr "1.5 baris"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+#, fuzzy
+msgid "Select Operation"
+msgstr "Pilih &semakan"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
-msgstr "Tetapan Gaya Menu"
+#: dialogs/selectopdlg.cpp:43
+#, fuzzy
+msgid "Sequence number:"
+msgstr "Jumlah Lajur"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, fuzzy, no-c-format
-msgid "Indentation type:"
-msgstr "Jenis per&nomboran:"
+#: dialogs/selectopdlg.cpp:46
+#, fuzzy
+msgid "Class operation:"
+msgstr "Kelas Pencetak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr ""
+#: dialogs/selectopdlg.cpp:54
+#, fuzzy
+msgid "Custom operation:"
+msgstr "Kamus Lazim:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/settingsdlg.cpp:30
+#, fuzzy
+msgid "Umbrello Setup"
+msgstr "Tetapan Halaman"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr "Tetingkap"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface"
+msgstr "Antaramuka Pengguna"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface Settings"
+msgstr "Bahasa Antaramuka Pengguna"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, fuzzy, no-c-format
-msgid "No Indentation"
-msgstr "Tiada Fail"
+#: dialogs/settingsdlg.cpp:54
+#, fuzzy
+msgid "Line color:"
+msgstr "Warna latarbelakang:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/settingsdlg.cpp:60
+#, fuzzy
+msgid "D&efault Color"
+msgstr "Warna latarbelakang:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, fuzzy, no-c-format
-msgid "Space"
-msgstr "Ruang selepas Lajur"
+#: dialogs/settingsdlg.cpp:63
+#, fuzzy
+msgid "Fill color:"
+msgstr "Warna latarbelakang:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, fuzzy, no-c-format
-msgid "Comment Verbosity"
-msgstr "Comment=Plugin KIPI"
+#: dialogs/settingsdlg.cpp:69
+#, fuzzy
+msgid "De&fault Color"
+msgstr "Ubah Warna Latarbelakang"
 
-#. 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:73
+#, fuzzy
+msgid "Line width:"
+msgstr "&Lebar Halaman"
+
+#: dialogs/settingsdlg.cpp:81
+#, fuzzy
+msgid "D&efault Width"
+msgstr "&Lebar Halaman"
+
+#: dialogs/settingsdlg.cpp:86
+#, fuzzy
+msgid "&Use fill color"
+msgstr "Ubah Warna Latarbelakang"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+#: dialogs/settingsdlg.cpp:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "Nyahbuat suntingan"
+
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "Guna Susunan RTL"
+
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
 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:126
+msgid "Autosave"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Language Options"
-msgstr "Pilihan Bina"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Wizard &Anti Spam..."
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Select Classes"
-msgstr "Pilih &semakan"
+#: dialogs/settingsdlg.cpp:146
+#, fuzzy
+msgid "Set autosave suffix:"
+msgstr "&Tetapan Halaman"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
+#: dialogs/settingsdlg.cpp:148
 msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+"<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/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr ""
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, fuzzy, no-c-format
-msgid "Classes Selected"
-msgstr "Muatturun Dipilih"
+#: dialogs/settingsdlg.cpp:158
+#, fuzzy
+msgid "Startup"
+msgstr "Permulaan Aplikasi"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, fuzzy, no-c-format
-msgid "Classes Available"
-msgstr "Form&at yang ada:"
+#: dialogs/settingsdlg.cpp:168
+#, fuzzy
+msgid "&Tip of the day"
+msgstr "Hari # dalam tahun"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, fuzzy, no-c-format
-msgid "Code Generation Status"
-msgstr "Papar Bar &Status"
+#: dialogs/settingsdlg.cpp:172
+#, fuzzy
+msgid "&Load last project"
+msgstr "Fail Projek Kexi"
 
-#. 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:176
+msgid "Start new project with:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Generation Status"
-msgstr "Bar &status"
-
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "Pemapar DjVu"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "No Diagram"
+msgstr "Tiada Fail"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, fuzzy, no-c-format
-msgid "Show hidden blocks"
-msgstr "Papar Bar &Status"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "Class Diagram"
+msgstr "Kelas Pencetak"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Use Case Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, fuzzy, no-c-format
-msgid "Show block type"
-msgstr "Jenis Senarai Semasa"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Sequence Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, fuzzy, no-c-format
-msgid "Colors"
-msgstr "Warna"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "Collaboration Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Font:"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "State Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, fuzzy, no-c-format
-msgid "Paper:"
-msgstr "Kertas..."
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Activity Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, fuzzy, no-c-format
-msgid "Selected:"
-msgstr "Muatturun Dipilih"
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Component Diagram"
+msgstr "Pemilih Komponen"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:187
+#, fuzzy
+msgid "Deployment Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:210
+#, fuzzy
+msgid "Class Settings"
+msgstr "Tetapan Semasa"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "Teks kiri-ke-kanan"
+#: dialogs/settingsdlg.cpp:217
+#, fuzzy
+msgid "Show &visibility"
+msgstr "Papar &Sejarah"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "Teks kiri-ke-kanan"
+#: dialogs/settingsdlg.cpp:221
+#, fuzzy
+msgid "Show attributes"
+msgstr "Papar &Sejarah"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, fuzzy, no-c-format
-msgid "Diagram Properties"
-msgstr "Ciri-ciri Dokumen"
+#: dialogs/settingsdlg.cpp:225
+#, fuzzy
+msgid "Show operations"
+msgstr "Papar &Sejarah"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nama:"
+#: dialogs/settingsdlg.cpp:229
+#, fuzzy
+msgid "Show stereot&ype"
+msgstr "Papar Bar &Status"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Zoom:"
-msgstr "&Zoom"
+#: dialogs/settingsdlg.cpp:233
+#, fuzzy
+msgid "Show attribute signature"
+msgstr "Lekang Tandatangan OpenPGP"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:238
+#, fuzzy
+msgid "Show package"
+msgstr "Pelihat Pakej"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
 msgid "Show operation signature"
 msgstr "Lekang Tandatangan OpenPGP"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, fuzzy, no-c-format
-msgid "Show &grid"
-msgstr "Papar &Sejarah"
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr ""
+"Nilai Permulaan \n"
+"Baru"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, fuzzy, no-c-format
-msgid "Snap &to grid"
-msgstr "&Lompat ke hiperlink"
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "Default tarikh (tanpa masa)"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "Saiz lajur automatik"
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "Default tarikh (tanpa masa)"
 
-#. 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."
-msgstr ""
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation"
+msgstr "Kod Objek"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, fuzzy, no-c-format
-msgid "Grid spacing:  "
-msgstr "Selangan Ganda"
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation Settings"
+msgstr "Ubah seting latar belakang"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+#, fuzzy
+msgid "Code Viewer Settings"
+msgstr "Ubah seting latar belakang"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "Initial state"
+msgstr "Caps Permulaan"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, fuzzy, no-c-format
-msgid "Line width:  "
-msgstr "&Lebar Halaman"
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "End state"
+msgstr "Letak di penghujung dokumen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "(Semua rujukan kelihatan)"
+#: dialogs/statedialog.cpp:96
+#, fuzzy
+msgid "State type:"
+msgstr "Jenis per&nomboran:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/statedialog.cpp:101
+#, fuzzy
+msgid "State name:"
+msgstr "Nama Medan"
+
+#: dialogs/statedialog.cpp:130
+#, fuzzy
+msgid "Widget Color"
+msgstr "Warna latarbelakang:"
+
+#: dialogs/umlattributedialog.cpp:42
+#, fuzzy
+msgid "Attribute Properties"
+msgstr "Ciri-ciri Dokumen"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 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/umlattributedialog.cpp:91
+#, fuzzy
+msgid "&Public"
+msgstr "Awam"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Jenis per&nomboran:"
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+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/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "Sedang Diguna"
+#: dialogs/umlattributedialog.cpp:156
+#, fuzzy
+msgid "Attribute Name Invalid"
+msgstr "Tetap Nama Imej"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+"The 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
-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)."
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, fuzzy, no-c-format
-msgid "Role Properties"
-msgstr "Ciri-ciri Dokumen"
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
+msgstr "Takrif Ciri-ciri Utama"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "Bahasa default:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
+#: dialogs/umlentityattributedialog.cpp:81
+#, fuzzy
+msgid "Length/Values:"
+msgstr "Tetap Nilai Default"
+
+#: dialogs/umlentityattributedialog.cpp:84
+#, fuzzy
+msgid "&Auto increment"
+msgstr " Auto Kemaskini"
+
+#: dialogs/umlentityattributedialog.cpp:88
+#, fuzzy
+msgid "Allow &null"
+msgstr "Benarkan Toolbar Tersendiri"
+
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, fuzzy, no-c-format
-msgid "Add only"
-msgstr "T_ambah Semua"
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "&1 Tiada"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
+#: dialogs/umlentityattributedialog.cpp:118
+#, fuzzy
+msgid "&Index"
+msgstr "Indeks Imej"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
 msgstr ""
 
-#: tips.txt:3
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 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/umloperationdialog.cpp:50
+#, fuzzy
+msgid "Operation Properties"
+msgstr "Ciri-ciri Dokumen"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 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/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 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/umloperationdialog.cpp:120
+#, fuzzy
+msgid "Parameters"
+msgstr "Parameter Tambahan"
+
+#: dialogs/umloperationdialog.cpp:141
+#, fuzzy
+msgid "Ne&w Parameter..."
+msgstr "&Ruang baris:"
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
 msgstr ""
 
-#: tips.txt:30
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+#, fuzzy
+msgid "Parameter Name Invalid"
+msgstr "Tetap Nama Imej"
+
+#: dialogs/umloperationdialog.cpp:339
 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"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 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/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#: tips.txt:43
+#: dialogs/umloperationdialog.cpp:406
 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"
+"The parameter name you have chosen is already being used in this operation."
 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/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
 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"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+#, fuzzy
+msgid "Operation Name Invalid"
+msgstr "Tetap Nama Imej"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
 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"
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, fuzzy, no-c-format
+msgid "Role Properties"
+msgstr "Ciri-ciri Dokumen"
+
+#: dialogs/umltemplatedialog.cpp:36
+#, fuzzy
+msgid "Template Properties"
+msgstr "Ciri-ciri Dokumen"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
 msgstr ""
 
-#: tips.txt:71
+#: dialogs/umltemplatedialog.cpp:129
+#, fuzzy
+msgid "Template Name Invalid"
+msgstr "Tetap Nama Imej"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
 msgstr ""
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Classes Display Options"
+msgstr "Pilihan Dua-Arah"
+
+#: dialogs/umlviewdialog.cpp:100
+#, fuzzy
+msgid "Diagram Colors"
+msgstr "Pengeditan Carta Aliran & Rajah"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
 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"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
 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"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+#, fuzzy
+msgid "Name Not Unique"
+msgstr "Fail %s tidak dijumpai"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+#, fuzzy
+msgid "&Line:"
+msgstr "Baris"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+#, fuzzy
+msgid "&Fill:"
+msgstr "Gaya pengisian:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
 msgstr ""
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:78
+#, fuzzy
+msgid "&Use fill"
+msgstr "Gaya pengisian:"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "(Semua rujukan kelihatan)"
+
+#: 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:108
+#: 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 ""
+
+#: 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
+#, fuzzy
+msgid "Save Error"
+msgstr "Ralat KMail"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Simpan ke fail"
+
+#: docgenerators/main.cpp:48
+#, fuzzy
+msgid "The XSLT file to use"
+msgstr "Fail untuk menyimpan suntingan:"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
 
+#: docgenerators/main.cpp:67 main.cpp:98
+#, fuzzy
+msgid "Umbrello UML Modeller Authors"
+msgstr "Fail Pemodel Umbrello UML"
+
+#: 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 "Nama"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#, fuzzy
+msgid "Enter name:"
+msgstr "Nama Medan"
+
+#: floatingtextwidget.cpp:112
+#, fuzzy
+msgid "Enter operation name:"
+msgstr "Tetap Nama Imej"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+#, fuzzy
+msgid "Enter new text:"
+msgstr "Ubah Warna Teks"
+
+#: floatingtextwidget.cpp:175
+#, fuzzy
+msgid "ERROR"
+msgstr "Ralat I/O"
+
+#: floatingtextwidget.cpp:264
+#, fuzzy
+msgid "Change Text"
+msgstr "Ubah Warna Teks"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "Tidak dapat membuka '%1'. Fail tidak wujud."
+
+#: 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
+#, fuzzy
+msgid "Load Error"
+msgstr "Ralat KMail"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Ralat - %s tidak dijumpai"
+
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 #, fuzzy
 msgid "Change Font..."
@@ -1675,6 +2009,10 @@ msgstr "&Tetingkap Baru"
 msgid "Select Operation..."
 msgstr "Pilih &semakan"
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 #, fuzzy
 msgid "Change Text..."
@@ -1732,6 +2070,19 @@ msgstr "Baru"
 msgid "Rename..."
 msgstr "Tukar nama"
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Ralat KMail"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 #, fuzzy
 msgid "Line Color..."
@@ -1766,15 +2117,28 @@ msgstr "Folder Rumah"
 msgid "Import Classes..."
 msgstr "&Import Gaya"
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+#, fuzzy
+msgid "Package"
+msgstr "Pelihat Pakej"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr ""
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
 msgid "Component Diagram..."
 msgstr "Pemilih Komponen"
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr ""
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 #, fuzzy
 msgid "Deployment Diagram..."
@@ -1785,11 +2149,19 @@ msgstr "Pengeditan Carta Aliran & Rajah"
 msgid "Folder"
 msgstr "Folder Rumah"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr ""
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Pengeditan Carta Aliran & Rajah"
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr ""
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 #, fuzzy
 msgid "Use Case Diagram..."
@@ -1835,6 +2207,19 @@ msgstr "Baru me&nggunakan Template"
 msgid "Export as Picture..."
 msgstr "Export sebagai HTML 4.01"
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+#, fuzzy
+msgid "Interface"
+msgstr "Antaramuka Pengguna"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr ""
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr ""
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
 msgid "Class Diagram..."
@@ -1860,26 +2245,10 @@ msgstr "Pengeditan Carta Aliran & Rajah"
 msgid "Collaboration Diagram..."
 msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr ""
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr ""
-
 #: 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
 #, fuzzy
 msgid "Operation Signature"
@@ -1894,12 +2263,6 @@ msgstr "Editor Tandatangan"
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-#, fuzzy
-msgid "Show"
-msgstr "Papar"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1927,15 +2290,6 @@ msgstr "Warna latarbelakang:"
 msgid "Use Fill Color"
 msgstr "Ubah Warna Latarbelakang"
 
-#: 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
-#, fuzzy
-msgid "Color"
-msgstr "Warna"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1968,10 +2322,30 @@ msgstr ""
 msgid "Package..."
 msgstr "Pelihat Pakej"
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#, fuzzy
+msgid "Initial State"
+msgstr "Caps Permulaan"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#, fuzzy
+msgid "End State"
+msgstr "Letak di penghujung dokumen"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr ""
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#, fuzzy
+msgid "Initial Activity"
+msgstr "Caps Permulaan"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#, fuzzy
+msgid "End Activity"
+msgstr "Letak di penghujung dokumen"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr ""
@@ -2021,6 +2395,14 @@ msgstr "Sauh notaakhir"
 msgid "Change Association Name..."
 msgstr "Tetap Nama Imej"
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Padam Diagram"
@@ -2058,207 +2440,119 @@ msgstr "Extension &fail:"
 
 #: 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
+#: model_utils.cpp:244
 #, fuzzy
-msgid "Incorrect use of associations."
-msgstr "Guna Susunan RTL"
+msgid "new_actor"
+msgstr "&Tetingkap Baru"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: model_utils.cpp:246
 #, fuzzy
-msgid "Association Error"
-msgstr "Ralat KMail"
+msgid "new_usecase"
+msgstr "&Tetingkap Baru"
 
-#: folder.cpp:289
+#: model_utils.cpp:248
 #, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Tidak dapat membuka '%1'. Fail tidak wujud."
+msgid "new_package"
+msgstr "Pelihat Pakej"
 
-#: folder.cpp:293
+#: model_utils.cpp:250
 #, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Ralat - %s tidak dijumpai"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Sharuzzaman Ahmat Raslan"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sharuzzaman@myrealbox.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 ""
-
-#: 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
-msgid "Namespace"
-msgstr ""
+msgid "new_component"
+msgstr "Pemilih Komponen"
 
-#: codeimport/classimport.cpp:34
+#: model_utils.cpp:252
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Ralat mengimport fail %s"
+msgid "new_node"
+msgstr "&Tetingkap Baru"
 
-#: codeimport/kdevcppparser/errors.cpp:23
+#: model_utils.cpp:254
 #, fuzzy
-msgid "Internal Error"
-msgstr "Ralat KMail"
+msgid "new_artifact"
+msgstr "&Tetingkap Baru"
 
-#: codeimport/kdevcppparser/errors.cpp:24
+#: model_utils.cpp:256
 #, fuzzy
-msgid "Syntax Error before '%1'"
-msgstr "Ralat sintaks API Skype"
+msgid "new_interface"
+msgstr "Antaramuka Pengguna"
 
-#: codeimport/kdevcppparser/errors.cpp:25
+#: model_utils.cpp:258
 #, fuzzy
-msgid "Parse Error before '%1'"
-msgstr "12 pt sebelum"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+msgid "new_datatype"
+msgstr "&Tetingkap Baru"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
+#: model_utils.cpp:260
 #, fuzzy
-msgid "expression expected"
-msgstr "Penyunting Ungkapan Nalar (regexp)"
+msgid "new_enum"
+msgstr "&Tetingkap Baru"
 
-#: codeimport/kdevcppparser/parser.cpp:598
+#: model_utils.cpp:262
 #, fuzzy
-msgid "Declaration syntax error"
-msgstr "Ralat sintaks API Skype"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr ""
+msgid "new_entity"
+msgstr "&Tetingkap Baru"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
+#: model_utils.cpp:264
 #, fuzzy
-msgid "Namespace name expected"
-msgstr "Tetap Nama Imej"
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr ""
+msgid "new_folder"
+msgstr "Folder Rumah"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
 #, fuzzy
-msgid "Constant expression expected"
-msgstr "Penyunting Ungkapan Nalar (regexp)"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr ""
+msgid "new_association"
+msgstr "&Tetingkap Baru"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: model_utils.cpp:268
+#, fuzzy
+msgid "new_object"
+msgstr "Salin Objek"
 
-#: 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
+#, fuzzy
+msgid "Empty"
+msgstr "Dokumen Kosong"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
+#: model_utils.cpp:560
 #, fuzzy
-msgid "Type id expected"
-msgstr "Jenis Senarai Semasa"
+msgid "Unknown argument type"
+msgstr "Fail %s adalah dari jenis tidak diketahui"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
+#: model_utils.cpp:560
 #, fuzzy
-msgid "Class name expected"
+msgid "Illegal method name"
 msgstr "Tetap Nama Imej"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr ""
+#: model_utils.cpp:561
+#, fuzzy
+msgid "Unknown return type"
+msgstr "Fail %s adalah dari jenis tidak diketahui"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
+#: model_utils.cpp:561
 #, fuzzy
-msgid "for initialization expected"
-msgstr "&Cari Bantuan"
+msgid "Unspecified error"
+msgstr "Ralat KMail"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
 msgstr ""
 
 #: objectwidget.cpp:90
@@ -2276,120 +2570,79 @@ msgstr "Tetap Nama Imej"
 msgid "new_parameter"
 msgstr "&Tetingkap Baru"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-#, fuzzy
-msgid "General Options"
-msgstr "Pilihan Bina"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "Fail Pakej RPM"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-#, fuzzy
-msgid "Virtual destructors"
-msgstr "Pengurus Mesin Maya"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-#, fuzzy
-msgid "Generate empty constructors"
-msgstr "Cipta dokumen kosong"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:50
+#: refactoring/refactoringassistant.cpp:289
 #, fuzzy
-msgid "Operations are inline"
-msgstr "Apakah ini?"
+msgid "Add Base Class"
+msgstr "Tambah lajur selepas"
 
-#: codegenerators/cppcodegenerationform.cpp:53
+#: refactoring/refactoringassistant.cpp:290
 #, fuzzy
-msgid "Accessors are inline"
-msgstr "Apakah ini?"
+msgid "Add Derived Class"
+msgstr "Tambah lajur selepas"
 
-#: codegenerators/cppcodegenerationform.cpp:57
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
 #, fuzzy
-msgid "Accessors are public"
-msgstr "Apakah ini?"
+msgid "Add Operation"
+msgstr "T_ambah Semua"
 
-#: umlview.cpp:297 umlview.cpp:357
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
 #, fuzzy
-msgid "Diagram: %2 Page %1"
-msgstr "Laman g&enap"
+msgid "Add Attribute"
+msgstr "T_ambah Semua"
 
-#: umlview.cpp:2578
+#: refactoring/refactoringassistant.cpp:297
 #, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Tetap Nama Imej"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr ""
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
+msgid "Add Base Interface"
+msgstr "Bahasa Antaramuka Pengguna"
 
-#: umlview.cpp:2738
+#: refactoring/refactoringassistant.cpp:298
 #, fuzzy
-msgid "Delete Diagram?"
-msgstr "Pa&dam hiperlink"
+msgid "Add Derived Interface"
+msgstr "Bahasa Antaramuka Pengguna"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
 #, fuzzy
-msgid "Rename canceled"
-msgstr "Tukarnama Halaman %1 ke %2"
+msgid "Base Classifiers"
+msgstr "Sistem Asas"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
 msgstr ""
 
-#: umllistviewitem.cpp:469
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
 #, fuzzy
-msgid "Function Not Implemented"
-msgstr "Fail %s tidak dijumpai"
+msgid "Enter State Name"
+msgstr "Tetap Nama Imej"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
 msgstr ""
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-#, fuzzy
-msgid "new_association"
-msgstr "&Tetingkap Baru"
-
-#: umlcanvasobject.cpp:150
+#: statewidget.cpp:176
 #, fuzzy
-msgid "new_attribute"
-msgstr "&Tetingkap Baru"
+msgid "Enter Activity"
+msgstr "Masukkan Katalaluan"
 
-#: umlcanvasobject.cpp:153
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_template"
-msgstr "Baru me&nggunakan Template"
+msgid "Incorrect use of associations."
+msgstr "Guna Susunan RTL"
 
-#: umlcanvasobject.cpp:156
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_operation"
-msgstr "&Tetingkap Baru"
+msgid "Association Error"
+msgstr "Ralat KMail"
 
-#: umlcanvasobject.cpp:159
+#: toolbarstateother.cpp:148 umlview.cpp:2511
 #, fuzzy
-msgid "new_literal"
+msgid "new state"
 msgstr "&Tetingkap Baru"
 
-#: umlcanvasobject.cpp:162
-#, fuzzy
-msgid "new_field"
-msgstr "Nama Medan"
-
 #: uml.cpp:179
 msgid "&Export model to DocBook"
 msgstr ""
@@ -2571,12 +2824,6 @@ msgstr "Export sebagai HTML 4.01"
 msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-#, fuzzy
-msgid "&Properties"
-msgstr "Ciri-ciri Dokumen"
-
 #: uml.cpp:286
 #, fuzzy
 msgid "&Zoom Slider"
@@ -2672,6 +2919,13 @@ msgstr "Dokumentasi"
 msgid "Opening file..."
 msgstr "Extension &fail:"
 
+#: 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
 #, fuzzy
 msgid "Creating new document..."
@@ -2679,8 +2933,8 @@ msgstr "Cipta dokumen baru"
 
 #: 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"
@@ -2708,12 +2962,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 ""
@@ -2754,8 +3016,8 @@ msgstr "Selit kandungan Papanklip"
 
 #: 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
@@ -2819,1425 +3081,1265 @@ msgstr "Semua Fail"
 msgid "Select Code to Import"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:50
-#, fuzzy
-msgid "Class &name:"
-msgstr "Nama Medan"
-
-#: dialogs/classgenpage.cpp:52
-#, fuzzy
-msgid "Actor &name:"
-msgstr "Nama Medan"
-
-#: dialogs/classgenpage.cpp:54
+#: umlcanvasobject.cpp:150
 #, fuzzy
-msgid "Package &name:"
-msgstr "Nama Medan"
+msgid "new_attribute"
+msgstr "&Tetingkap Baru"
 
-#: dialogs/classgenpage.cpp:56
+#: umlcanvasobject.cpp:153
 #, fuzzy
-msgid "Use case &name:"
-msgstr "Tetap Nama Imej"
+msgid "new_template"
+msgstr "Baru me&nggunakan Template"
 
-#: dialogs/classgenpage.cpp:58
+#: umlcanvasobject.cpp:156
 #, fuzzy
-msgid "Interface &name:"
-msgstr "Nama Medan"
+msgid "new_operation"
+msgstr "&Tetingkap Baru"
 
-#: dialogs/classgenpage.cpp:60
+#: umlcanvasobject.cpp:159
 #, fuzzy
-msgid "Component &name:"
-msgstr "Nama Medan"
+msgid "new_literal"
+msgstr "&Tetingkap Baru"
 
-#: dialogs/classgenpage.cpp:62
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Artifact &name:"
+msgid "new_field"
 msgstr "Nama Medan"
 
-#: dialogs/classgenpage.cpp:64
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "Enum &name:"
-msgstr "Nama Medan"
+msgid "UML Model"
+msgstr "Model Pencetak"
 
-#: dialogs/classgenpage.cpp:66
+#: umldoc.cpp:106
 #, fuzzy
-msgid "Datatype &name:"
-msgstr "Nama Medan"
+msgid "Logical View"
+msgstr "Lihat Normal"
 
-#: dialogs/classgenpage.cpp:68
+#: umldoc.cpp:107
 #, fuzzy
-msgid "Entity &name:"
-msgstr "Nama Medan"
+msgid "Use Case View"
+msgstr "Lihat sejarah dokumen"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#: umldoc.cpp:108
 #, fuzzy
-msgid "&Stereotype name:"
-msgstr "Nama Medan"
+msgid "Component View"
+msgstr "Lihat Normal"
 
-#: dialogs/classgenpage.cpp:107
+#: umldoc.cpp:109
 #, fuzzy
-msgid "&Package name:"
-msgstr "Nama Medan"
+msgid "Deployment View"
+msgstr "Lihat Normal"
 
-#: dialogs/classgenpage.cpp:121
-#, fuzzy
-msgid "A&bstract class"
-msgstr "Kelas Pencetak"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-#, fuzzy
-msgid "A&bstract use case"
-msgstr "Senarai Huruf Kecil"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-#, fuzzy
-msgid "&Executable"
-msgstr "Fail Boleh Laksana"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:138
+#: umldoc.cpp:355
 #, fuzzy
-msgid "Draw As"
-msgstr "Mempuny&ai label"
+msgid "The file %1 does not exist."
+msgstr "Tak dapat membuka fail %s."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Default"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr ""
 
-#: dialogs/classgenpage.cpp:149
-#, fuzzy
-msgid "&Library"
-msgstr "Perkongsian Pustaka"
+#: 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:152
-#, fuzzy
-msgid "&Table"
-msgstr "&Jadual"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:182
+#: umldoc.cpp:934
 #, fuzzy
-msgid "Pro&tected"
-msgstr "Dokumen Quattro Pro"
-
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr ""
+msgid "use case diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: dialogs/classgenpage.cpp:256
+#: umldoc.cpp:936
 #, fuzzy
-msgid "Class name:"
-msgstr "Nama Medan"
+msgid "class diagram"
+msgstr "Kelas Pencetak"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#: umldoc.cpp:938
 #, fuzzy
-msgid "Instance name:"
-msgstr "Nama Medan"
+msgid "sequence diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: dialogs/classgenpage.cpp:272
+#: umldoc.cpp:940
 #, fuzzy
-msgid "Draw as actor"
-msgstr "&Simpan Imej Sebagai"
+msgid "collaboration diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: dialogs/classgenpage.cpp:277
+#: umldoc.cpp:942
 #, fuzzy
-msgid "Multiple instance"
-msgstr "Berbilang Desktop"
+msgid "state diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: dialogs/classgenpage.cpp:284
+#: umldoc.cpp:944
 #, fuzzy
-msgid "Show destruction"
-msgstr "Papar &Sejarah"
+msgid "activity diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: dialogs/classgenpage.cpp:322
+#: umldoc.cpp:946
 #, fuzzy
-msgid "Component name:"
-msgstr "Nama Medan"
+msgid "component diagram"
+msgstr "Pemilih Komponen"
 
-#: dialogs/classgenpage.cpp:324
+#: umldoc.cpp:948
 #, fuzzy
-msgid "Node name:"
-msgstr "Nama Medan"
+msgid "deployment diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
+#: umldoc.cpp:950
 #, fuzzy
-msgid "Stereotype name:"
-msgstr "Nama Medan"
+msgid "entity relationship diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: 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:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-#, fuzzy
-msgid "Name is Not Unique"
-msgstr "Fail %s adalah jenis tidak disokong pada masa ini"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:58
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "&Line:"
-msgstr "Baris"
+msgid "Use Name"
+msgstr "Nama Medan"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "&Fill:"
-msgstr "Gaya pengisian:"
+msgid "Enter New Name"
+msgstr "Tetap Nama Imej"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-#, fuzzy
-msgid "&Use fill"
-msgstr "Gaya pengisian:"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "Activities"
-msgstr "Aktiviti penapis &log"
+msgid "Delete Diagram"
+msgstr "Pa&dam hiperlink"
 
-#: dialogs/activitypage.cpp:72
+#: umldoc.cpp:1573
 #, fuzzy
-msgid "New Activity..."
-msgstr "&Tetingkap Baru"
+msgid "Setting up the document..."
+msgstr "Cipta dokumen baru"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+#: umldoc.cpp:1600
 #, fuzzy
-msgid "Rename"
-msgstr "Tukar nama"
+msgid "Resolving object references..."
+msgstr "Salin Objek Embed"
 
-#: dialogs/activitypage.cpp:134
+#: umldoc.cpp:1638
 #, fuzzy
-msgid "New Activity"
-msgstr "&Tetingkap Baru"
+msgid "Loading UML elements..."
+msgstr "Memuatkan Clip Art"
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1811
 #, fuzzy
-msgid "Rename Activity"
-msgstr "Tukarnama Halaman %1 ke %2"
+msgid "Loading diagrams..."
+msgstr "Memuatkan Clip Art"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
+#: umllistview.cpp:348
 #, fuzzy
-msgid "Association Properties"
-msgstr "Ciri-ciri Dokumen"
+msgid "Externalize Folder"
+msgstr "Folder Rumah"
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+#: umllistview.cpp:416
 #, fuzzy
-msgid "General Settings"
-msgstr "Tetapan Semasa"
+msgid "Enter Model Name"
+msgstr "Tetap Nama Imej"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-#, fuzzy
-msgid "Role Settings"
-msgstr "Tetapan Semasa"
-
-#: 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 Settings"
-msgstr "Seting Fon"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-#, fuzzy
-msgid "Association font"
-msgstr "Font Semasa"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
 #, fuzzy
-msgid "Template Properties"
-msgstr "Ciri-ciri Dokumen"
+msgid "Name Not Valid"
+msgstr "Fail %s tidak dijumpai"
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-#, fuzzy
-msgid "General Properties"
-msgstr "Ciri-ciri Dokumen"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-#, fuzzy
-msgid "&Type:"
-msgstr "Jenis"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "&Name:"
-msgstr "&Nama:"
+msgid "Loading listview..."
+msgstr "Memuatkan Clip Art"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
+#: umllistview.cpp:2671
 #, fuzzy
-msgid "Template Name Invalid"
-msgstr "Tetap Nama Imej"
+msgid "Folder Not Empty"
+msgstr "Cipta dokumen kosong"
 
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+#, fuzzy
+msgid "Rename canceled"
+msgstr "Tukarnama Halaman %1 ke %2"
 
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-#, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Takrif Ciri-ciri Utama"
-
-#: dialogs/umlentityattributedialog.cpp:73
+#: umllistviewitem.cpp:469
 #, fuzzy
-msgid "&Default value:"
-msgstr "Bahasa default:"
+msgid "Function Not Implemented"
+msgstr "Fail %s tidak dijumpai"
 
-#: dialogs/umlentityattributedialog.cpp:81
-#, fuzzy
-msgid "Length/Values:"
-msgstr "Tetap Nilai Default"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
+#: umlview.cpp:297 umlview.cpp:357
 #, fuzzy
-msgid "&Auto increment"
-msgstr " Auto Kemaskini"
+msgid "Diagram: %2 Page %1"
+msgstr "Laman g&enap"
 
-#: dialogs/umlentityattributedialog.cpp:88
+#: umlview.cpp:2578
 #, fuzzy
-msgid "Allow &null"
-msgstr "Benarkan Toolbar Tersendiri"
+msgid "Enter Diagram Name"
+msgstr "Tetap Nama Imej"
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
+#: umlview.cpp:2738
 #, fuzzy
-msgid "&None"
-msgstr "&1 Tiada"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr ""
+msgid "Delete Diagram?"
+msgstr "Pa&dam hiperlink"
 
-#: dialogs/umlentityattributedialog.cpp:118
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "&Index"
-msgstr "Indeks Imej"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr ""
+msgid "Exporting view..."
+msgstr "Lihat Normal"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-#, fuzzy
-msgid "Display"
-msgstr "Paparan"
-
-#: dialogs/umlviewdialog.cpp:93
+#: umlviewimageexporter.cpp:67
 #, fuzzy
-msgid "Classes Display Options"
-msgstr "Pilihan Dua-Arah"
+msgid "File Already Exists"
+msgstr "Fail telah wujud.  Tulisganti fail '%s'?"
 
-#: dialogs/umlviewdialog.cpp:100
-#, fuzzy
-msgid "Diagram Colors"
-msgstr "Pengeditan Carta Aliran & Rajah"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Tidak dapat memasukkan Pecahan dalam jadual"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Jenis:"
+#: 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:30
-#, fuzzy
-msgid "Umbrello Setup"
-msgstr "Tetapan Halaman"
+#: 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:47
+#: worktoolbar.cpp:245
 #, fuzzy
-msgid "User Interface"
-msgstr "Antaramuka Pengguna"
+msgid "Object"
+msgstr "Salin Objek"
 
-#: dialogs/settingsdlg.cpp:47
+#: worktoolbar.cpp:246
 #, fuzzy
-msgid "User Interface Settings"
-msgstr "Bahasa Antaramuka Pengguna"
+msgid "Synchronous Message"
+msgstr "Mesej Emel"
 
-#: dialogs/settingsdlg.cpp:54
+#: worktoolbar.cpp:247
 #, fuzzy
-msgid "Line color:"
-msgstr "Warna latarbelakang:"
+msgid "Asynchronous Message"
+msgstr "Mesej Emel"
 
-#: dialogs/settingsdlg.cpp:60
-#, fuzzy
-msgid "D&efault Color"
-msgstr "Warna latarbelakang:"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Label"
 
-#: dialogs/settingsdlg.cpp:63
+#: worktoolbar.cpp:252
 #, fuzzy
-msgid "Fill color:"
-msgstr "Warna latarbelakang:"
+msgid "Note"
+msgstr "&Notakaki"
 
-#: dialogs/settingsdlg.cpp:69
+#: worktoolbar.cpp:253
 #, fuzzy
-msgid "De&fault Color"
-msgstr "Ubah Warna Latarbelakang"
+msgid "Box"
+msgstr "Kotak Senarai"
 
-#: dialogs/settingsdlg.cpp:73
+#: worktoolbar.cpp:257
 #, fuzzy
-msgid "Line width:"
-msgstr "&Lebar Halaman"
+msgid "Relationship"
+msgstr "Kaitan:"
 
-#: dialogs/settingsdlg.cpp:81
+#: worktoolbar.cpp:258
 #, fuzzy
-msgid "D&efault Width"
-msgstr "&Lebar Halaman"
+msgid "Directional Association"
+msgstr "Pilihan Dua-Arah"
 
-#: dialogs/settingsdlg.cpp:86
-#, fuzzy
-msgid "&Use fill color"
-msgstr "Ubah Warna Latarbelakang"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
+#: worktoolbar.cpp:275
 #, fuzzy
-msgid "Enable undo"
-msgstr "Nyahbuat suntingan"
+msgid "Deep History"
+msgstr "Sejarah &Dokumen"
 
-#: dialogs/settingsdlg.cpp:112
+#: worktoolbar.cpp:276
 #, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "Guna Susunan RTL"
+msgid "Shallow History"
+msgstr "Sejarah &Dokumen"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:277
+msgid "Join"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: worktoolbar.cpp:278
+msgid "Fork"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:146
+#: worktoolbar.cpp:290
 #, fuzzy
-msgid "Set autosave suffix:"
-msgstr "&Tetapan Halaman"
+msgid "Message"
+msgstr "Mesej Emel"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
+#: worktoolbar.cpp:302
 #, fuzzy
-msgid "Startup"
-msgstr "Permulaan Aplikasi"
+msgid "Select"
+msgstr "Pilih"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:168
-#, fuzzy
-msgid "&Tip of the day"
-msgstr "Hari # dalam tahun"
-
-#: dialogs/settingsdlg.cpp:172
-#, fuzzy
-msgid "&Load last project"
-msgstr "Fail Projek Kexi"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "No Diagram"
-msgstr "Tiada Fail"
-
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "Class Diagram"
-msgstr "Kelas Pencetak"
-
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Use Case Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
-
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Sequence Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
-
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "Collaboration Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
-
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "State Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
-
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Activity Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
-
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Component Diagram"
-msgstr "Pemilih Komponen"
-
-#: dialogs/settingsdlg.cpp:187
-#, fuzzy
-msgid "Deployment Diagram"
-msgstr "Pengeditan Carta Aliran & Rajah"
-
-#: dialogs/settingsdlg.cpp:210
-#, fuzzy
-msgid "Class Settings"
-msgstr "Tetapan Semasa"
-
-#: dialogs/settingsdlg.cpp:217
-#, fuzzy
-msgid "Show &visibility"
-msgstr "Papar &Sejarah"
-
-#: dialogs/settingsdlg.cpp:221
-#, fuzzy
-msgid "Show attributes"
-msgstr "Papar &Sejarah"
-
-#: dialogs/settingsdlg.cpp:225
-#, fuzzy
-msgid "Show operations"
-msgstr "Papar &Sejarah"
-
-#: dialogs/settingsdlg.cpp:229
-#, fuzzy
-msgid "Show stereot&ype"
-msgstr "Papar Bar &Status"
-
-#: dialogs/settingsdlg.cpp:233
-#, fuzzy
-msgid "Show attribute signature"
-msgstr "Lekang Tandatangan OpenPGP"
-
-#: dialogs/settingsdlg.cpp:238
-#, fuzzy
-msgid "Show package"
-msgstr "Pelihat Pakej"
-
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
-"Nilai Permulaan \n"
-"Baru"
-
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "Default tarikh (tanpa masa)"
-
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "Default tarikh (tanpa masa)"
-
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation"
-msgstr "Kod Objek"
-
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation Settings"
-msgstr "Ubah seting latar belakang"
 
-#: dialogs/settingsdlg.cpp:301
-#, fuzzy
-msgid "Code Viewer Settings"
-msgstr "Ubah seting latar belakang"
-
-#: dialogs/umloperationdialog.cpp:50
-#, fuzzy
-msgid "Operation Properties"
-msgstr "Ciri-ciri Dokumen"
-
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Papar &Sejarah"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Padam Diagram"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-#, fuzzy
-msgid "Parameters"
-msgstr "Parameter Tambahan"
-
-#: dialogs/umloperationdialog.cpp:141
-#, fuzzy
-msgid "Ne&w Parameter..."
-msgstr "&Ruang baris:"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Bar &status"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-#, fuzzy
-msgid "Parameter Name Invalid"
-msgstr "Tetap Nama Imej"
-
-#: dialogs/umloperationdialog.cpp:339
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
 msgid ""
-"The parameter name you have chosen\n"
-"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:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nama Medan"
+
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-#, fuzzy
-msgid "Operation Name Invalid"
-msgstr "Tetap Nama Imej"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Default"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-#, fuzzy
-msgid "Role A Properties"
-msgstr "Ciri-ciri Dokumen"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, fuzzy, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Senarai Bintang"
 
-#: dialogs/assocrolepage.cpp:51
-#, fuzzy
-msgid "Role B Properties"
-msgstr "Ciri-ciri Dokumen"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, fuzzy, no-c-format
+msgid "Style:"
+msgstr "Gaya:"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-#, fuzzy
-msgid "Contained Items"
-msgstr "&Pilih Item Baru"
-
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "Dokumentasi Fedora"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, fuzzy, no-c-format
+msgid "vector"
+msgstr "Grafik boleh Skala Vektor"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:45
-#, fuzzy
-msgid "N&ew Template..."
-msgstr "Buka Template"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "Jajar-tengah perenggan"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "Jajar-tengah perenggan"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "Initial activity"
-msgstr "Caps Permulaan"
-
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "End activity"
-msgstr "Letak di penghujung dokumen"
-
-#: dialogs/activitydialog.cpp:82
-#, fuzzy
-msgid "Activity type:"
-msgstr "Jenis per&nomboran:"
-
-#: dialogs/activitydialog.cpp:87
-#, fuzzy
-msgid "Activity name:"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, fuzzy, no-c-format
+msgid "Class name"
 msgstr "Nama Medan"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-#, fuzzy
-msgid "Widget Colors"
-msgstr "%1 (widget tersendiri)"
-
-#: dialogs/umlattributedialog.cpp:42
-#, fuzzy
-msgid "Attribute Properties"
-msgstr "Ciri-ciri Dokumen"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-#, fuzzy
-msgid "&Initial value:"
-msgstr "Nilai Notaakhir permulaan"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Project Generation"
+msgstr "Projek Fedora"
 
-#: dialogs/umlattributedialog.cpp:91
-#, fuzzy
-msgid "&Public"
-msgstr "Awam"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Cipta dokumen kosong baru"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr ""
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Auto-kesan kemera"
 
-#: dialogs/umlattributedialog.cpp:156
-#, fuzzy
-msgid "Attribute Name Invalid"
-msgstr "Tetap Nama Imej"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, fuzzy, no-c-format
+msgid "Empty constructor methods"
+msgstr "Cipta dokumen kosong"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "Pilih &semakan"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, fuzzy, no-c-format
+msgid "From Parent Object"
+msgstr "Salin Objek Embed"
 
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "Jumlah Lajur"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-#, fuzzy
-msgid "Class operation:"
-msgstr "Kelas Pencetak"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-#, fuzzy
-msgid "Custom operation:"
-msgstr "Kamus Lazim:"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, fuzzy, no-c-format
+msgid "From Parent Role"
+msgstr "Selit MathML dari fail"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-#, fuzzy
-msgid "Filter"
-msgstr "<b>Menerapkan tindakan penapis:</b> "
-
-#: dialogs/diagramprintpage.cpp:48
-#, fuzzy
-msgid "&Current diagram"
-msgstr "Tarikh Semasa"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-#, fuzzy
-msgid "&All diagrams"
-msgstr "Aba&i Semua"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, fuzzy, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Letak di penghujung dokumen"
 
-#: dialogs/diagramprintpage.cpp:57
-#, fuzzy
-msgid "&Select diagrams"
-msgstr "Pilih &semakan"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-#, fuzzy
-msgid "&Type of diagram"
-msgstr "Jenis per&nomboran:"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Bahasa"
 
-#: dialogs/diagramprintpage.cpp:65
-#, fuzzy
-msgid "Selection"
-msgstr "Pilihan"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, fuzzy, no-c-format
+msgid "Folders"
+msgstr "Cari Fail/Folder"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-#, fuzzy
-msgid "No diagrams selected."
-msgstr "Tiada plugin dipilih"
-
-#: dialogs/classpropdlg.cpp:118
-#, fuzzy
-msgid "Display Options"
-msgstr "Pilihan Bina"
-
-#: dialogs/classpropdlg.cpp:179
-#, fuzzy
-msgid "Attribute Settings"
-msgstr "Tetapan Semasa"
-
-#: dialogs/classpropdlg.cpp:187
-#, fuzzy
-msgid "Operation Settings"
-msgstr "Tetapan Semasa"
-
-#: dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates Settings"
-msgstr "Tetapan Semasa"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals Settings"
-msgstr "Ubah seting latar belakang"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Ubah seting latar belakang"
+#: 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:216
-#, fuzzy
-msgid "Contents Settings"
-msgstr "Tetapan Semasa"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, fuzzy, no-c-format
+msgid "Overwrite Policy"
+msgstr "Fail telah wujud.  Tulisganti fail '%s'?"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: 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/classpropdlg.cpp:222
-#, fuzzy
-msgid "Class Associations"
-msgstr "Kelas Pencetak"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr "Editor Tandatangan"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, fuzzy, no-c-format
+msgid "As&k"
+msgstr "Mempuny&ai label"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
+#: 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:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:248
+#, fuzzy, no-c-format
+msgid "&Use a different name"
+msgstr "Simpan dokumen dengan nama lain"
 
-#: 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
-#, fuzzy
-msgid "Attr&ibute signature"
-msgstr "Lekang Tandatangan OpenPGP"
-
-#: dialogs/classoptionspage.cpp:108
-#, fuzzy
-msgid "Draw as circle"
-msgstr "&Simpan Imej Sebagai"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Memformat"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "Initial state"
-msgstr "Caps Permulaan"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, fuzzy, no-c-format
+msgid "Lines"
+msgstr "1.5 baris"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "End state"
-msgstr "Letak di penghujung dokumen"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "Tetapan Gaya Menu"
 
-#: dialogs/statedialog.cpp:96
-#, fuzzy
-msgid "State type:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, fuzzy, no-c-format
+msgid "Indentation type:"
 msgstr "Jenis per&nomboran:"
 
-#: dialogs/statedialog.cpp:101
-#, fuzzy
-msgid "State name:"
-msgstr "Nama Medan"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr ""
 
-#: dialogs/statedialog.cpp:130
-#, fuzzy
-msgid "Widget Color"
-msgstr "Warna latarbelakang:"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-#, fuzzy
-msgid "new_class"
-msgstr "Kelas Pencetak"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Tetingkap"
 
-#: dialogs/classwizard.cpp:54
-#, fuzzy
-msgid "New Class"
-msgstr "Kelas Pencetak"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classwizard.cpp:59
-#, fuzzy
-msgid "Class Attributes"
-msgstr "Kelas Pencetak"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, fuzzy, no-c-format
+msgid "No Indentation"
+msgstr "Tiada Fail"
 
-#: dialogs/classwizard.cpp:63
-#, fuzzy
-msgid "Class Operations"
-msgstr "Kelas Pencetak"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/parmpropdlg.cpp:35
-#, fuzzy
-msgid "Parameter Properties"
-msgstr "Ciri-ciri Dokumen"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, fuzzy, no-c-format
+msgid "Space"
+msgstr "Ruang selepas Lajur"
 
-#: dialogs/parmpropdlg.cpp:82
-#, fuzzy
-msgid "Passing Direction"
-msgstr "Penan&da Arah"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, fuzzy, no-c-format
+msgid "Comment Verbosity"
+msgstr "Comment=Plugin KIPI"
 
-#: 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"
+#: 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:120
-#, fuzzy
-msgid "Finish"
-msgstr "Selesai "
-
-#: dialogs/codegenerationwizard.cpp:132
-#, fuzzy
-msgid "Code Generated"
-msgstr "Kod Objek"
-
-#: dialogs/codegenerationwizard.cpp:134
-#, fuzzy
-msgid "Not Generated"
-msgstr "Tiada"
-
-#: dialogs/codegenerationwizard.cpp:141
-#, fuzzy
-msgid "Not Yet Generated"
-msgstr "Fail %s tidak dijumpai"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments 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:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Amaran: tandabuku yang anda berikan [%s] tidak wujud."
+#: dialogs/codegenerationoptionsbase.ui:468
+#, fuzzy, no-c-format
+msgid "Language Options"
+msgstr "Pilihan Bina"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Folder Rumah"
+#: dialogs/codegenerationwizardbase.ui:16
+#, fuzzy, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Wizard &Anti Spam..."
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "Cipta dokumen baru"
+#: dialogs/codegenerationwizardbase.ui:23
+#, fuzzy, no-c-format
+msgid "Select Classes"
+msgstr "Pilih &semakan"
 
-#: 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
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Wizard Folder Rangkaian"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 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:101
+#, fuzzy, no-c-format
+msgid "Classes Selected"
+msgstr "Muatturun Dipilih"
+
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Ralat menulis ketika cuba menyimpan %s"
+#: dialogs/codegenerationwizardbase.ui:159
+#, fuzzy, no-c-format
+msgid "Classes Available"
+msgstr "Form&at yang ada:"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr ""
+#: dialogs/codegenerationwizardbase.ui:209
+#, fuzzy, no-c-format
+msgid "Code Generation Status"
+msgstr "Papar Bar &Status"
 
-#: 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
-#, fuzzy
-msgid "Destination File Already Exists"
-msgstr "Fail telah wujud.  Tulisganti fail '%s'?"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, fuzzy, no-c-format
+msgid "Generation Status"
+msgstr "Bar &status"
 
-#: 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."
-msgstr ""
+#: dialogs/codeviewerdialogbase.ui:43
+#, fuzzy, no-c-format
+msgid "Show hidden blocks"
+msgstr "Papar Bar &Status"
 
-#: 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"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr ""
+#: dialogs/codeviewerdialogbase.ui:86
+#, fuzzy, no-c-format
+msgid "Show block type"
+msgstr "Jenis Senarai Semasa"
 
-#: dialogs/overwritedialogue.cpp:40
-#, fuzzy
-msgid "&Do Not Generate File"
-msgstr "Tak dapat membuka fail %s."
+#: dialogs/codevieweroptionsbase.ui:45
+#, fuzzy, no-c-format
+msgid "Colors"
+msgstr "Warna"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Font:"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:103
+#, fuzzy, no-c-format
+msgid "Paper:"
+msgstr "Kertas..."
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-#, fuzzy
-msgid "Enter multiplicity:"
-msgstr "Masukkan Katalaluan"
+#: dialogs/codevieweroptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "Selected:"
+msgstr "Muatturun Dipilih"
 
-#: associationwidget.cpp:2346
-#, fuzzy
-msgid "Association Name"
-msgstr "Nama Medan"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr ""
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-#, fuzzy
-msgid "Enter association name:"
-msgstr "Tetap Nama Imej"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr ""
 
-#: associationwidget.cpp:2366
-#, fuzzy
-msgid "Role Name"
-msgstr "Nama Medan"
+#: dialogs/codevieweroptionsbase.ui:294
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "Teks kiri-ke-kanan"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-#, fuzzy
-msgid "Enter role name:"
-msgstr "Tetap Nama Imej"
+#: dialogs/codevieweroptionsbase.ui:333
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "Teks kiri-ke-kanan"
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "Tetap Nama Imej"
+#: dialogs/diagrampropertiespage.ui:30
+#, fuzzy, no-c-format
+msgid "Diagram Properties"
+msgstr "Ciri-ciri Dokumen"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Enter new text:"
-msgstr "Ubah Warna Teks"
+#: dialogs/diagrampropertiespage.ui:92
+#, fuzzy, no-c-format
+msgid "Zoom:"
+msgstr "&Zoom"
 
-#: floatingtextwidget.cpp:175
-#, fuzzy
-msgid "ERROR"
-msgstr "Ralat I/O"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Change Text"
-msgstr "Ubah Warna Teks"
+#: dialogs/diagrampropertiespage.ui:186
+#, fuzzy, no-c-format
+msgid "Show &grid"
+msgstr "Papar &Sejarah"
 
-#: aligntoolbar.cpp:40
-#, fuzzy
-msgid "Align Left"
-msgstr "Jajar kiri perenggan"
+#: dialogs/diagrampropertiespage.ui:194
+#, fuzzy, no-c-format
+msgid "Snap &to grid"
+msgstr "&Lompat ke hiperlink"
 
-#: aligntoolbar.cpp:41
-#, fuzzy
-msgid "Align Right"
-msgstr "Jajar kanan perenggan"
+#: dialogs/diagrampropertiespage.ui:202
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "Saiz lajur automatik"
 
-#: aligntoolbar.cpp:42
-#, fuzzy
-msgid "Align Top"
-msgstr "Margin Atas [%s]"
+#: 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:43
-#, fuzzy
-msgid "Align Bottom"
-msgstr "Margin Bawah [%s]"
+#: dialogs/diagrampropertiespage.ui:257
+#, fuzzy, no-c-format
+msgid "Grid spacing:  "
+msgstr "Selangan Ganda"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Pisah di Pertengahan"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Pisah di Pertengahan"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Jajar-tengah perenggan"
+#: dialogs/diagrampropertiespage.ui:346
+#, fuzzy, no-c-format
+msgid "Line width:  "
+msgstr "&Lebar Halaman"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Jajar-tengah perenggan"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "(Semua rujukan kelihatan)"
 
-#: 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"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Jenis per&nomboran:"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Lihat Normal"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "Sedang Diguna"
 
-#: 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
-#, fuzzy
-msgid "File Already Exists"
-msgstr "Fail telah wujud.  Tulisganti fail '%s'?"
-
-#: model_utils.cpp:244
-#, fuzzy
-msgid "new_actor"
-msgstr "&Tetingkap Baru"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr ""
 
-#: model_utils.cpp:246
-#, fuzzy
-msgid "new_usecase"
-msgstr "&Tetingkap Baru"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr ""
 
-#: model_utils.cpp:248
-#, fuzzy
-msgid "new_package"
-msgstr "Pelihat Pakej"
+#: umbrelloui.rc:5
+#, fuzzy, no-c-format
+msgid "&Export"
+msgstr "Eksport Fail"
 
-#: model_utils.cpp:250
-#, fuzzy
-msgid "new_component"
-msgstr "Pemilih Komponen"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: model_utils.cpp:252
-#, fuzzy
-msgid "new_node"
-msgstr "&Tetingkap Baru"
+#: umbrelloui.rc:13
+#, fuzzy, no-c-format
+msgid "&Diagram"
+msgstr "Pengeditan Carta Aliran & Rajah"
 
-#: model_utils.cpp:254
-#, fuzzy
-msgid "new_artifact"
-msgstr "&Tetingkap Baru"
+#: umbrelloui.rc:14
+#, fuzzy, no-c-format
+msgid "&New"
+msgstr "&Baru"
 
-#: model_utils.cpp:256
-#, fuzzy
-msgid "new_interface"
-msgstr "Antaramuka Pengguna"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr ""
 
-#: model_utils.cpp:258
-#, fuzzy
-msgid "new_datatype"
-msgstr "&Tetingkap Baru"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "&Zoom"
 
-#: model_utils.cpp:260
-#, fuzzy
-msgid "new_enum"
-msgstr "&Tetingkap Baru"
+#: umbrelloui.rc:43
+#, fuzzy, no-c-format
+msgid "&Code"
+msgstr "Kod Objek"
 
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "&Tetingkap Baru"
+#: umbrelloui.rc:47
+#, fuzzy, no-c-format
+msgid "Active &Language"
+msgstr "Tetapan bahasa"
 
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "Folder Rumah"
+#: 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
-#, fuzzy
-msgid "new_object"
-msgstr "Salin Objek"
+#: 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
-#, fuzzy
-msgid "Empty"
-msgstr "Dokumen Kosong"
+#: 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
-#, fuzzy
-msgid "Unknown argument type"
-msgstr "Fail %s adalah dari jenis tidak diketahui"
+#: 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
-#, fuzzy
-msgid "Illegal method name"
-msgstr "Tetap Nama Imej"
+#: 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
-#, fuzzy
-msgid "Unknown return type"
-msgstr "Fail %s adalah dari jenis tidak diketahui"
+#: 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
-#, fuzzy
-msgid "Unspecified error"
-msgstr "Ralat KMail"
+#: 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
-#, fuzzy
-msgid "Add Base Class"
-msgstr "Tambah lajur selepas"
+#: 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
-#, fuzzy
-msgid "Add Derived Class"
-msgstr "Tambah lajur selepas"
+#: 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
-#, fuzzy
-msgid "Add Operation"
-msgstr "T_ambah Semua"
+#: 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
-#, fuzzy
-msgid "Add Attribute"
-msgstr "T_ambah Semua"
+#: 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
-#, fuzzy
-msgid "Add Base Interface"
-msgstr "Bahasa Antaramuka Pengguna"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
 
-#: refactoring/refactoringassistant.cpp:298
-#, fuzzy
-msgid "Add Derived Interface"
-msgstr "Bahasa Antaramuka Pengguna"
+#: 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
-#, fuzzy
-msgid "Base Classifiers"
-msgstr "Sistem Asas"
+#: 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
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Tidak dapat memasukkan Pecahan dalam jadual"
+#: 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 ""
diff --git a/tde-i18n-nb/messages/tdesdk/umbrello.po b/tde-i18n-nb/messages/tdesdk/umbrello.po
index 4d352b2b762..a1e927b8520 100644
--- a/tde-i18n-nb/messages/tdesdk/umbrello.po
+++ b/tde-i18n-nb/messages/tdesdk/umbrello.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-04-23 14:28+0200\n"
 "Last-Translator: Jørgen Grønlund <jorgenhg@broadpark.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -19,247 +19,207 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=n != 1;\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML-modelleringsforfattere"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Fil som skal åpnes"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "© 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML-modelleringsforfattere"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML-modelleringsforfattere"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Knut Yrvin, Espen Fjellvær Olsen"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "&Eksporter som bilde …"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "knuty@skolelinux.no, espenfjo@gmail.com"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
 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"
-msgstr "Det oppsto et problem med å lagre filen: %1"
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr "Navn på den nye aktiviteten:"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Lagringsfeil"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Venstrejuster"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Høyrejuster"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synkron melding"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Toppjuster"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynkron melding"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Bunnjuster"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Forbindelse"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Midtstill loddrett"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Oppsamling"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Midtstill vannrett"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Anker"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Midtstill loddrett"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Merkelapp"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Midtstill vannrett"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Notat"
+#: aligntoolbar.cpp:383
+#, fuzzy
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"For å sidejustere må du markere minst to elementer. Du kan ikke sidejustere "
+"forbindelser."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Boks"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatering"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktør"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Avhengighet"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisering"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Sammenhopning"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Slektskap"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr ""
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementere (Generalisering/Realisering)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Sammensettning"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Skill mellom store og små bokstaver"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Klasse"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Starttilstand"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Sluttilstand"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Forgrening/Fletting"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Splitte/Slå sammen"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pakke"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponent"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Punkt"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Avhengighet"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artifakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Forbindelse"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Grensesnitt"
+#: association.cpp:88
+#, fuzzy
+msgid "Self Association"
+msgstr "Selvutvalg"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datatype"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Samarbeidsmelding"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enum"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Rekkemelding"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Eksistens"
+#: association.cpp:91
+#, fuzzy
+msgid "Collaboration Self Message"
+msgstr "Selvsammarbeidsmelding"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Dyp historie"
+#: association.cpp:92
+#, fuzzy
+msgid "Sequence Self Message"
+msgstr "Selvrekkemelding"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Grunn historie"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Oppsamling"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Slå sammen"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Sammensettning"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Forgren"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisering"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Uni-forbindelse"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Valg"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Anker"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Tilstandsoverføring"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Aktivitetsoverføring"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktivitet"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Tilstand"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Sluttaktivitet"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Startaktivitet"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Melding"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr ""
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "UDEFINERT"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Valg"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr ""
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Det er et ugyldig navn:"
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Ugyldig navn"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr "Navnet er allerede i bruk."
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr "Navnet er ikke unikt"
 
 #: 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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -279,10 +239,8 @@ msgid "Cannot Open File"
 msgstr "Kan ikke åpne filen"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kunne ikke opprette mappen:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Kunne ikke opprette mappen:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -296,1281 +254,1519 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Kan ikke opprette mappe"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Generelle innstillinger"
+
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuell destruktør"
+
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Lag tom konstruktør"
+
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
 msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
 msgstr ""
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Navn på den nye aktiviteten:"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "ny aktivitet"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-modell"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importerer filen: %1"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logisk visning"
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Klar."
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Usecase-visning"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Er virkefeltet %1 et navnerom, eller en klasse?"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentvisning"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++-importeringer krever din hjelp"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Uplasseringsvisning"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Navneområde"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entitetsrelasjonmodell"
+#: 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 "Klasse"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datatyper"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
-"Gjeldende fil har blitt modifisert.\n"
-"Vil du lagre den?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Fila %1 finnes ikke."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
 
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Innlastingsfeil"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Fila %1 ser ut til å være ødelagt."
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Det ble ikke funnet en XMI-fil i den komprimerte fila %1."
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Det oppsto et problem med å laste den utpakkede filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Det var et problem med å laste filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Det var et problem med å laste opp filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "usecase-diagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klassediagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "rekkediagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "samarbeidsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "tilstandsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "aktivitetsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponentdiagram"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "entitetsrelasjonsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+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 "Navn"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Oppgi navn:"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Dette er et ugyldig navn for et diagram."
+#: codeimport/kdevcppparser/parser.cpp:2374
+#, fuzzy
+msgid "Class name expected"
+msgstr "Klasse"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Ugyldig navn"
+#: 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:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "En annet diagram bruker dette navnet."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+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"
-msgstr "Navnet er ikke unikt"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+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."
-msgstr "Det er et ugyldig navn:"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+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."
-msgstr "Navnet er allerede i bruk."
+#: 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 "&Egenskaper"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Navnet du skrev inn var ikke unikt.\n"
-"Er dette det du ønsker?"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Opprinnelig aktivitet"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Navnet er ikke unikt"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Sluttaktivitet"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Bruk navn"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Forgrening/Fletting"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Skriv inn nytt navn"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Splitte/Slå sammen"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Er du sikker på at du vil slette diagrammet %1?"
+#: 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 "Generelt"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Slett diagram"
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "Generelle egenskaper"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Setter opp dokumentet …"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Aktivitetstype:"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Aktivitetsnavn:"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Laster UML-elementer …"
+#: 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 "Dokumentasjon"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Laster diagrammer …"
+#: 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"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Skriftinnstillinger"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%1"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Farge"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Gjør mappe ekstern"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Elementfarger"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Angi modellnavn:"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktiviteter"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Skriv inn et nytt navn på modellen:"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Ny aktivitet …"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Visninger"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Slett diagram"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Navnet du skrev inn er ugyldig.\n"
-"Opprettelsesprosessen har blitt avbrutt."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Endre navn"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ugyldig navn"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Ny aktivitet"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Navnet du skrev inn er ikke unikt.\n"
-"Opprettelsesprosessen har blitt avbrutt."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "ny aktivitet"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Opprettelse avbrutt"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Endre navn på aktivitet"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Laster listevisning …"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Navn på aktiviteten:"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Mappa må være tom før den kan slettes."
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Navn:"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Mappa er ikke tom"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Forbindelser"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Forbindelseegenskaper"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-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 "Generelle innstillinger"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisering"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roller"
 
-#: association.cpp:88
-#, fuzzy
-msgid "Self Association"
-msgstr "Selvutvalg"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rolleegenskaper"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Samarbeidsmelding"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Forbindelsesskrift"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Rekkemelding"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "A-rolleegenskaper"
 
-#: association.cpp:91
-#, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Selvsammarbeidsmelding"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "B-rolleegenskaper"
 
-#: association.cpp:92
-#, fuzzy
-msgid "Sequence Self Message"
-msgstr "Selvrekkemelding"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "A-rollesikt"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisering"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "B-rollesikt"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Uni-forbindelse"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Rolle A, skiftbarhet"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Rolle B, skiftbarhet"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+msgid "Rolename:"
+msgstr "Rollenavn:"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nytt"
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, fuzzy, no-c-format
+msgid "Multiplicity:"
+msgstr "Mangfold:"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: 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 "Sh&ow"
-msgstr "&Vis"
+msgid "Public"
+msgstr "Offentlig"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Kode"
+msgid "Private"
+msgstr "Privat"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: 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 "Active &Language"
-msgstr "&Aktivt språk"
+msgid "Protected"
+msgstr "Beskyttet"
 
-#. 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
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Documentation"
-msgstr "Dokumentasjon"
+msgid "Implementation"
+msgstr "Implementasjon"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Skråstrek – skråstrek (//)"
+msgid "Changeable"
+msgstr "Skiftbar"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Skråstrek – stjerne (/**  */)"
+msgid "Frozen"
+msgstr "Fryst"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+msgid "Add only"
+msgstr "Bare legg til"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Kodeopprettelse i C++</p>"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Klasse&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Generelt"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Aktør&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr ""
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Pakke&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Usecase&navn:"
+
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Grensesnitt&navn:"
+
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponent&navn:"
+
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artifakt&navn:"
+
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datatype&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entitets&navn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variabel</b>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Sterotypnavn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr " …"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Pakkenavn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "&Abstrakt klasse"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "streng"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstrakt usecase"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Streng</p>"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Kjørbar"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Liste</p>"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Tegn som"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Standard"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Fyll:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Bibliotek"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klassenavn"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabell"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Include-fil</p></i>"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Synlighet"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Prosjektopprettelse"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "O&ffentlig"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Opprett ANT-byggedokument"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivat"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Autolag metoder"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&Beskyttet"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Tomme konstruktør-metoder"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentasjon"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr ""
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klassenavn:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instansenavn:"
+
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Tegn som aktør"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Flere instanser"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Vis destruksjon"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponentnavn:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nodenavn:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotypnavn:"
+
+#: 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 ""
+"Navnet du har valgt\n"
+"er allerede i bruk.\n"
+"Navnet har blitt tilbakestilt."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Offentlig"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Navnet er ikke unikt"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Privat"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Egenskaper"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Beskyttet"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&y egenskap …"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Fra foreldreobjekt"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operasjoner"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&y operasjon …"
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Maler"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&y mal …"
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Fra foreldrerolle"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entitetsegenskaper"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Opprettelse av Java-kode</p>"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&y entitetsegenskap …"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hash (#)"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+msgid "&Delete"
+msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Start-Slutt (=start  =slutt)"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Egenskaper"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Opprettelse av Ruby-kode</p>"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Vis"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Operasjoner"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Synlighet"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "&Operasjonssignatur"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Pakke"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&Attributter"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Stereotyp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "&Attributtsignatur"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Tegn som sirkel"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Vis"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Visningsalternativer"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attributtinnstillinger"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operasjonsinnstillinger"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Malinnstillinger"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Innstillinger for entitetsegenskaper"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Oppsamling"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Innholdsinnstillinger"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klasseforbindelser"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "ny_klasse"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Ny_klasse"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klasseattributter"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klasseoperasjoner"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Egenskaper for kodeopprettelse"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Språk"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Opprett"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Mapper"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Fullfør"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Skriv alle opprettede filer til mappa:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kode opprettet"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Bla &gjennom …"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ikke opprettet"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "B&la gjennom …"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ikke opprettet enda"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Inkluder header-filer fra mappa:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Mappa %1 finnes ikke. Vil du lage den nå?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Filer som er laget av kodeoppretteren vil bli skrevet til denne mappa"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Utdatamappa finnes ikke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Opprett mappe"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ikke opprett"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Filer i denne mappa vil bli brukt som header-filer i den opprettede koden"
+"Mappa kunne ikke opprettes.\n"
+"Sørg for at du har skrivetilgang til foreldremappen, eller velg en annen "
+"gyldig mappe."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Overskrivningsregler"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Feil ved oppretting av mappe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Velg en gyldig mappe."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
+"Utdatamappa finnes, men er ikke skrivbar.\n"
+"Vennligst sett nødvendige tilganger, eller velg en annen mappe."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "O&verskriv"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Feil under skriving til utdatamappe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Overskriv eksisterende filer hvis de finnes i målmappa"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 er ikke en mappe. Velg en gyldig mappe."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Spør"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Velg en gyldig mappe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Gi spørsmål om hva som skal gjøres hvis en fil med det samme allerede finnes"
+msgid "Code Viewer"
+msgstr "Kodevisning"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Bruk et annet navn"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Ingen alternativer tilgjengelig.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Hvis det finnes en fil i målmappa, velg et annet navn ved å legge til et "
-"suffiks til filnavnet."
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatering"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linjer"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Gjeldende diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Linjesluttstil:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Alle diagrammer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Indenteringsstil:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Velg diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Identeringsavstand:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Diagramtype"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Utvalg"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Skill mellom store og små bokstaver"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Samarbeid"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Ingen indentering"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Rekke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulator"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Tilstand"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Mellomrom"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponent"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Utplassering"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Ingen diagram valgt."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "Notatdokumentasjon"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Destinasjonsfila finnes allerede"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"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 ""
+"Fila %1 finnes allerede i %2. \n"
+"Umbrello kan overskrive filen, lage et lignende filnavn, eller ikke lage "
+"denne fila."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Legg til i alle gjenstående filer"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Overskriv"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Opprett lignende filnavn"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Ikke lag filen"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameteregenskaper"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Type:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Navn:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Startverdi:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
+"«inn» er en skrivebeskyttet parameter. «ut» er en lesebeskyttet parameter. "
+"«innut» er en parameter for både skriving og lesing."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr ""
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Inneværende elementer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr ""
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Velg en operasjon"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr ""
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Rekkefølgenummer:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr ""
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klasseoperasjon:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr ""
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Tilpasset operasjon:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr ""
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Oppsett av Umbrello"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr ""
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Brukergrensesnitt"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kodevisning"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Innstillinger for brukergrensesnitt"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr ""
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Linjefarge:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Standardfarge"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr ""
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Fyllfarge:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Farger"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "&Standardfarge"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr ""
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Linjebredde:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr ""
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "&Standardbredde"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr ""
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Bruk fyllfarge"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Skru på angrefunksjon"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Bruk diagrammer med faner"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Bruk ny C++/Java-generatorer"
+
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagramegenskaper"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Autolagre"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Navn:"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Skru på autolagring"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Velg tidsintervall for automatisk lagring (i minutter):"
+
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Velg forstavelse til autolagring:"
+
+#: dialogs/settingsdlg.cpp:148
+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>"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Oppstart"
+
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Oppstartslogo"
+
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Dagens tips"
+
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Last forrige prosjekt"
+
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Start nytt prosjekt med:"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Inget diagram"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klassediagram"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Usecase-diagram"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Rekkediagram"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Samarbeidsdiagram"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Tilstandsdiagram"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Aktivitetsdiagram"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponentdiagram"
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klasseinnstillinger"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Vis &synlighet"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Vis attributter"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Vis operasjoner"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Vis stereot&yp"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Vis attributtsignatur"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Vis pakke"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Vis operasjonssignatur"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr ""
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr "Starter virkefelt"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr ""
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "Standard virkefelt for attributt:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "Standard virkefelt for operasjon:"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kodeopprettelse"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Innstillinger for kodeopprettelse"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Innstillinger for kodevisning"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Starttilstand"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Sluttilstand"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tilstandstype:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Tilstandsnavn:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Skjermelementsfarge"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attributtegenskaper"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Offentlig"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Besk&yttet"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementasjon"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Du har angitt et ugyldig attributtnavn."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attributtnavnet er ugyldig"
+
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"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 ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Attributtnavnet du valgte er allerede i bruk i denne operasjonen."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr ""
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attributtnavnet er ikke unikt"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Egenskaper for entitetsattributter"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Standardverdi:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Lengde/Verdier:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Autoøk"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Tillat &null"
 
-#. 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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributter:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Tilstandstype:"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksering"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Ingen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "mappe"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primær"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unik"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Du har oppgitt et ugyldig navn til entitetsattributten."
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Navnet til entitetsattributten er ugyldig"
+
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"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 ""
+"Entitetsattributt-navnet du valgte er allerede i bruk i denne operasjonen."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Navnet til entitetsattributten er ikke unikt."
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operasjonsegenskaper"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstrakt operasjon"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Spørring (\"const\")"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametre"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "N&y parameter …"
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Du har skrevet inn et ugyldig parameternavn."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parameternavnet er ugyldig"
+
+#: 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 ""
+"Parameternavnet du har valgt\n"
+"er allerede brukt i denne operasjonen."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameternavnet er ikke unikt"
+
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Parameternavnet du har valg er allerede i bruk i denne operasjonen."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Du har skrevet inn et ugyldig operasjonsnavn."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operasjonsnavn ugyldig"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "En operasjon med denne signaturen finnes allerede i %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Velg et annet navn eller en annen parameterliste."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "Rolleegenskaper"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rollenavn:"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Malegenskaper"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, fuzzy, no-c-format
-msgid "Multiplicity:"
-msgstr "Mangfold:"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Du har skrevet inn et ugyldig malnavn."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Ugyldig malnavn"
+
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Navnet på malparameteren du har valgt er allerede i bruk i denne operasjonen."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Bare legg til"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Navnet på malen er ikke unikt"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Fryst"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Vindusklasseinnstillinger"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Skiftbar"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagramfarger"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Navnet du har skrevet inn er ugyldig."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementasjon"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Navnet du oppga er ikke unikt."
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Navnet er ikke unikt"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linje:"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Fyll:"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Standard"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Bruk fyll"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "&Eksporter som bilde …"
 
-#: 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"
+#: 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:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr "Det oppsto et problem med å lagre filen: %1"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Lagringsfeil"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML-modelleringsforfattere"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Fil som skal åpnes"
 
-#: 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/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:71
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "© 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML-modelleringsforfattere"
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML-modelleringsforfattere"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-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 "Navn"
 
-#: 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 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Oppgi navn:"
+
+#: 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 ""
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
 msgstr ""
 
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Mappefila %1 finnes ikke."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Innlastingsfeil"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Mappefila %1 kan ikke åpnes."
+
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
 msgstr ""
@@ -1628,6 +1824,10 @@ msgstr ""
 msgid "Select Operation..."
 msgstr ""
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr ""
@@ -1681,6 +1881,19 @@ msgstr "Ny"
 msgid "Rename..."
 msgstr "Gi nytt navn …"
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Feil ved innliming"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr ""
@@ -1710,14 +1923,26 @@ msgstr "Kan ikke opprette mappe"
 msgid "Import Classes..."
 msgstr ""
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pakke"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artifakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponentdiagram …"
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Punkt"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1727,10 +1952,18 @@ msgstr ""
 msgid "Folder"
 msgstr "Mappe"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Eksistens"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Entitetsrelasjonsdiagram …"
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktør"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Usecase-diagram …"
@@ -1767,6 +2000,18 @@ msgstr ""
 msgid "Export as Picture..."
 msgstr ""
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Grensesnitt"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datatype"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enum"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klassediagram …"
@@ -1787,27 +2032,11 @@ msgstr "Sekvensdiagram …"
 msgid "Collaboration Diagram..."
 msgstr "Samarbeidsdiagram …"
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Egenskaper"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operasjoner"
-
 #: listpopupmenu.cpp:676
 #, fuzzy
 msgid "Public Only"
 msgstr "Offentlig"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Synlighet"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr ""
@@ -1820,11 +2049,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Vis"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1849,14 +2073,6 @@ msgstr ""
 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 "Farge"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1885,10 +2101,26 @@ msgstr ""
 msgid "Package..."
 msgstr ""
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Starttilstand"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Sluttilstand"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr ""
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Startaktivitet"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Sluttaktivitet"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr ""
@@ -1934,6 +2166,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 ""
@@ -1969,8 +2209,8 @@ 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
@@ -1978,187 +2218,99 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "© 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML-modelleringsforfattere"
 
-#: 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 "Mappefila %1 finnes ikke."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Mappefila %1 kan ikke åpnes."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Knut Yrvin, Espen Fjellvær Olsen"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "knuty@skolelinux.no, espenfjo@gmail.com"
-
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Klar."
-
-#: 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 "Er virkefeltet %1 et navnerom, eller en klasse?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++-importeringer krever din hjelp"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Navneområde"
-
-#: codeimport/classimport.cpp:34
-#, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importerer filen: %1"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "ny_aktør"
 
-#: 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"
-msgstr ""
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "ny_pakke"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr ""
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "ny_komponent"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nytt_punkt"
 
-#: 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"
-msgstr ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nytt_grensesnitt"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "ny_datatype"
 
-#: 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 "nytt_punkt"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#, fuzzy
+msgid "new_association"
+msgstr "ny_forbindelse"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nytt_objekt"
 
-#: 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 "Tom"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr ""
+#: model_utils.cpp:559
+#, fuzzy
+msgid "Malformed argument"
+msgstr "Malformatert argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Ukjent argumenttype"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-#, fuzzy
-msgid "Class name expected"
-msgstr "Klasse"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Ulovlig navn på metode"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr ""
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Ukjent tilbakemeldingstype"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr ""
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Uspesifisert feil"
 
-#: 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 ""
+"Dette er et reservert nøkkelord for språket til den kodegeneratoren som er "
+"satt opp."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr ""
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reservert nøkkelord"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2172,103 +2324,65 @@ msgstr ""
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Generelle innstillinger"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuell destruktør"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Lag tom konstruktør"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 msgstr ""
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
 msgstr ""
 
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
 msgstr ""
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
 msgstr ""
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
 msgstr ""
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Tildeling av nytt navn ble avbrutt"
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funksjonen er ikke implementert"
-
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
 msgstr ""
-"Navnet du anga var ugyldig.\n"
-"Prosessen med å gi nytt navn ble avbrutt."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-#, fuzzy
-msgid "new_association"
-msgstr "ny_forbindelse"
-
-#: 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
@@ -2424,11 +2538,6 @@ msgstr "&Eksporter som bilde …"
 msgid "Export &All Diagrams as Pictures..."
 msgstr "&Eksporter som bilde …"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Egenskaper"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Skaleringsglidebryter"
@@ -2513,6 +2622,13 @@ msgstr "&Dokumentasjon"
 msgid "Opening file..."
 msgstr "Åpner fil …"
 
+#: 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 "Oppretter nytt dokument …"
@@ -2520,15 +2636,15 @@ msgstr "Oppretter nytt dokument …"
 #: uml.cpp:673
 #, fuzzy
 msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, *."
+"xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Uncompressed XMI Files (*.xmi)\n"
 "*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Alle støttede filer(*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Alle støttede filer(*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2)\n"
 "*.xmi|Ukomprimert XMI-filer (*.xmi)\n"
 "*.xmi.tgz|Gzip-komprimerte XMI-filer (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2-komprimerte XMI-filer (*.xmi.tar.bz2)"
@@ -2557,6 +2673,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-komprimert XMI-fil\n"
 "*|Alle filer"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2565,6 +2685,10 @@ msgstr ""
 "Fila %1 finnes.\n"
 "Vil du overskrive den?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Overskriv"
@@ -2600,8 +2724,8 @@ msgstr "Sett inn innhold fra utklippstavla …"
 
 #: uml.cpp:849
 msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+"Umbrello could not paste the clipboard contents.  The objects in the "
+"clipboard may be of the wrong type to be pasted here."
 msgstr ""
 "Umbrello klarte ikke å lime inn innholdet fra utklippstavla. Objektene på "
 "utklippstavla kan være av en annen type enn den som kan limes inn her."
@@ -2660,1260 +2784,1232 @@ msgstr "Alle filer"
 msgid "Select Code to Import"
 msgstr "Velg kode som skal importeres"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Klasse&navn:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Aktør&navn:"
-
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Pakke&navn:"
-
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Usecase&navn:"
-
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Grensesnitt&navn:"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponent&navn:"
-
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artifakt&navn:"
-
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datatype&navn:"
-
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entitets&navn:"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Sterotypnavn:"
-
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Pakkenavn:"
-
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "&Abstrakt klasse"
-
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstrakt usecase"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Kjørbar"
-
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Tegn som"
-
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Standard"
-
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Bibliotek"
-
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabell"
-
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "O&ffentlig"
-
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivat"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&Beskyttet"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentasjon"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klassenavn:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instansenavn:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-modell"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Tegn som aktør"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logisk visning"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Flere instanser"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Usecase-visning"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Vis destruksjon"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentvisning"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponentnavn:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Uplasseringsvisning"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nodenavn:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entitetsrelasjonmodell"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotypnavn:"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datatyper"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:229
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
-"Navnet du har valgt\n"
-"er allerede i bruk.\n"
-"Navnet har blitt tilbakestilt."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Navnet er ikke unikt"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linje:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Fyll:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Standard"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Bruk fyll"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktiviteter"
+"Gjeldende fil har blitt modifisert.\n"
+"Vil du lagre den?"
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Ny aktivitet …"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Fila %1 finnes ikke."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Endre navn"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Fila %1 ser ut til å være ødelagt."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Ny aktivitet"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Det ble ikke funnet en XMI-fil i den komprimerte fila %1."
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Endre navn på aktivitet"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Det oppsto et problem med å laste den utpakkede filen: %1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Navn på aktiviteten:"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Det var et problem med å laste filen: %1"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Forbindelseegenskaper"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Det var et problem med å laste opp filen: %1"
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "Generelle innstillinger"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "usecase-diagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roller"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klassediagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rolleegenskaper"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "rekkediagram"
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Skriftinnstillinger"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "samarbeidsdiagram"
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Forbindelsesskrift"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "tilstandsdiagram"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Malegenskaper"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "aktivitetsdiagram"
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Generelle egenskaper"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponentdiagram"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Type:"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Navn:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "entitetsrelasjonsdiagram"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Du har skrevet inn et ugyldig malnavn."
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Dette er et ugyldig navn for et diagram."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Ugyldig malnavn"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "En annet diagram bruker dette navnet."
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Navnet på malparameteren du har valgt er allerede i bruk i denne operasjonen."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Navnet på malen er ikke unikt"
+"Navnet du skrev inn var ikke unikt.\n"
+"Er dette det du ønsker?"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Egenskaper for entitetsattributter"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Bruk navn"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Standardverdi:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Skriv inn nytt navn"
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Lengde/Verdier:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Er du sikker på at du vil slette diagrammet %1?"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Autoøk"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Slett diagram"
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Tillat &null"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Setter opp dokumentet …"
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributter:"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksering"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Laster UML-elementer …"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Ingen"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Laster diagrammer …"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primær"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Gjør mappe ekstern"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unik"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Angi modellnavn:"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Du har oppgitt et ugyldig navn til entitetsattributten."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Skriv inn et nytt navn på modellen:"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Navnet til entitetsattributten er ugyldig"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Visninger"
 
-#: 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 ""
-"Entitetsattributt-navnet du valgte er allerede i bruk i denne operasjonen."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Navnet til entitetsattributten er ikke unikt."
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Vis"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Vindusklasseinnstillinger"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagramfarger"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Navnet du har skrevet inn er ugyldig."
-
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Navnet du oppga er ikke unikt."
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type:"
-
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Oppsett av Umbrello"
+"Navnet du skrev inn er ugyldig.\n"
+"Opprettelsesprosessen har blitt avbrutt."
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Brukergrensesnitt"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ugyldig navn"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Innstillinger for brukergrensesnitt"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Navnet du skrev inn er ikke unikt.\n"
+"Opprettelsesprosessen har blitt avbrutt."
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Linjefarge:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Opprettelse avbrutt"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Standardfarge"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Laster listevisning …"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Fyllfarge:"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Mappa må være tom før den kan slettes."
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "&Standardfarge"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Mappa er ikke tom"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Linjebredde:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Tildeling av nytt navn ble avbrutt"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "&Standardbredde"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Bruk fyllfarge"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funksjonen er ikke implementert"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Skru på angrefunksjon"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Navnet du anga var ugyldig.\n"
+"Prosessen med å gi nytt navn ble avbrutt."
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Bruk diagrammer med faner"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Bruk ny C++/Java-generatorer"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Autolagre"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Skru på autolagring"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Velg tidsintervall for automatisk lagring (i minutter):"
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Laster listevisning …"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Velg forstavelse til autolagring:"
+#: 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 "Oppstart"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Oppstartslogo"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Kunne ikke opprette mappen:\n"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Dagens tips"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Last forrige prosjekt"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Start nytt prosjekt med:"
+#: 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 "No Diagram"
-msgstr "Inget 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:183
-msgid "Class Diagram"
-msgstr "Klassediagram"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Usecase-diagram"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synkron melding"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Rekkediagram"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynkron melding"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Samarbeidsdiagram"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Merkelapp"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Tilstandsdiagram"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Notat"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Aktivitetsdiagram"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Boks"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponentdiagram"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Slektskap"
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klasseinnstillinger"
-
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Vis &synlighet"
-
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Vis attributter"
-
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Vis operasjoner"
-
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Vis stereot&yp"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementere (Generalisering/Realisering)"
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Vis attributtsignatur"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Dyp historie"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Vis pakke"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Grunn historie"
 
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
-msgstr "Starter virkefelt"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Slå sammen"
 
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "Standard virkefelt for attributt:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Forgren"
 
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "Standard virkefelt for operasjon:"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kodeopprettelse"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Valg"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Innstillinger for kodeopprettelse"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Aktivitetsoverføring"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Innstillinger for kodevisning"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Melding"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operasjonsegenskaper"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "UDEFINERT"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstrakt operasjon"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Valg"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Spørring (\"const\")"
-
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Besk&yttet"
-
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementasjon"
-
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametre"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "N&y parameter …"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Du har skrevet inn et ugyldig parameternavn."
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parameternavnet er ugyldig"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Vis operasjoner"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
-"Parameternavnet du har valgt\n"
-"er allerede brukt i denne operasjonen."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameternavnet er ikke unikt"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "&Rensk diagram …"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Parameternavnet du har valg er allerede i bruk i denne operasjonen."
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Du har skrevet inn et ugyldig operasjonsnavn."
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalisering"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operasjonsnavn ugyldig"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
 msgid ""
-"An operation with that signature already exists in %1.\n"
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
-"En operasjon med denne signaturen finnes allerede i %1.\n"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Velg et annet navn eller en annen parameterliste."
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "A-rolleegenskaper"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "B-rolleegenskaper"
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "A-rollesikt"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Forbindelser"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "B-rollesikt"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Rolle A, skiftbarhet"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Rolle B, skiftbarhet"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Inneværende elementer"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Standard"
 
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "Notatdokumentasjon"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&y egenskap …"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Skråstrek – skråstrek (//)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&y operasjon …"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Skråstrek – stjerne (/**  */)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Maler"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&y mal …"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Kodeopprettelse i C++</p>"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entitetsegenskaper"
-
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&y entitetsegenskap …"
-
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Opprinnelig aktivitet"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Sluttaktivitet"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Aktivitetstype:"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variabel</b>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Aktivitetsnavn:"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr " …"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Elementfarger"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attributtegenskaper"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "streng"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Startverdi:"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Streng</p>"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Offentlig"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Liste</p>"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Du har angitt et ugyldig attributtnavn."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attributtnavnet er ugyldig"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Attributtnavnet du valgte er allerede i bruk i denne operasjonen."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attributtnavnet er ikke unikt"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klassenavn"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Velg en operasjon"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Include-fil</p></i>"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Rekkefølgenummer:"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Prosjektopprettelse"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klasseoperasjon:"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Opprett ANT-byggedokument"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Tilpasset operasjon:"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Autolag metoder"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammer"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Tomme konstruktør-metoder"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Gjeldende diagram"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Alle diagrammer"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Fra foreldreobjekt"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Velg diagram"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Diagramtype"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Utvalg"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Fra foreldrerolle"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Samarbeid"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Opprettelse av Java-kode</p>"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Rekke"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hash (#)"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Utplassering"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Start-Slutt (=start  =slutt)"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Ingen diagram valgt."
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Opprettelse av Ruby-kode</p>"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Visningsalternativer"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Språk"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attributtinnstillinger"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Mapper"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operasjonsinnstillinger"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Skriv alle opprettede filer til mappa:"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Malinnstillinger"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Bla &gjennom …"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "B&la gjennom …"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Innstillinger for entitetsegenskaper"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Inkluder header-filer fra mappa:"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Innholdsinnstillinger"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Filer som er laget av kodeoppretteren vil bli skrevet til denne mappa"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Forbindelser"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Filer i denne mappa vil bli brukt som header-filer i den opprettede koden"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klasseforbindelser"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Overskrivningsregler"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Operasjoner"
+#: 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/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Synlighet"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "O&verskriv"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "&Operasjonssignatur"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Overskriv eksisterende filer hvis de finnes i målmappa"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Pakke"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Spør"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&Attributter"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Gi spørsmål om hva som skal gjøres hvis en fil med det samme allerede finnes"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Stereotyp"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Bruk et annet navn"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "&Attributtsignatur"
+#: 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 ""
+"Hvis det finnes en fil i målmappa, velg et annet navn ved å legge til et "
+"suffiks til filnavnet."
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Tegn som sirkel"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatering"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Starttilstand"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linjer"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Sluttilstand"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Linjesluttstil:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tilstandstype:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Indenteringsstil:"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Tilstandsnavn:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Identeringsavstand:"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Skjermelementsfarge"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "ny_klasse"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Ny_klasse"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klasseattributter"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Ingen indentering"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klasseoperasjoner"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulator"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameteregenskaper"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Mellomrom"
 
-#: 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 ""
-"«inn» er en skrivebeskyttet parameter. «ut» er en lesebeskyttet parameter. "
-"«innut» er en parameter for både skriving og lesing."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Opprett"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Fullfør"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kode opprettet"
-
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ikke opprettet"
+#: 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:141
-msgid "Not Yet Generated"
-msgstr "Ikke opprettet enda"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Mappa %1 finnes ikke. Vil du lage den nå?"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Utdatamappa finnes ikke"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Opprett mappe"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ikke opprett"
+#: 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 ""
-"Mappa kunne ikke opprettes.\n"
-"Sørg for at du har skrivetilgang til foreldremappen, eller velg en annen gyldig "
-"mappe."
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Feil ved oppretting av mappe"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Velg en gyldig mappe."
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+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:101
+#, no-c-format
+msgid "Classes Selected"
 msgstr ""
-"Utdatamappa finnes, men er ikke skrivbar.\n"
-"Vennligst sett nødvendige tilganger, eller velg en annen mappe."
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Feil under skriving til utdatamappe"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 er ikke en mappe. Velg en gyldig mappe."
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Velg en gyldig mappe"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Destinasjonsfila finnes allerede"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+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/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
-"Fila %1 finnes allerede i %2. \n"
-"Umbrello kan overskrive filen, lage et lignende filnavn, eller ikke lage denne "
-"fila."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Legg til i alle gjenstående filer"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Overskriv"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Opprett lignende filnavn"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Ikke lag filen"
+#: 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 "<p align=\"center\">Ingen alternativer tilgjengelig.</p>"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Farger"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
 msgstr ""
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
 msgstr ""
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
 msgstr ""
 
-#: 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 "Diagramegenskaper"
+
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
 msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Venstrejuster"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Høyrejuster"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Toppjuster"
+#: 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:43
-msgid "Align Bottom"
-msgstr "Bunnjuster"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr ""
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Midtstill loddrett"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr ""
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Midtstill vannrett"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr ""
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Midtstill loddrett"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr ""
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Midtstill vannrett"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr ""
 
-#: aligntoolbar.cpp:383
-#, fuzzy
-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 ""
-"For å sidejustere må du markere minst to elementer. Du kan ikke sidejustere "
-"forbindelser."
 
-#: 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 ""
-"Dette er et reservert nøkkelord for språket til den kodegeneratoren som er satt "
-"opp."
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reservert nøkkelord"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Tilstandstype:"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Laster listevisning …"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "mappe"
 
-#: 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"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "ny_aktør"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr ""
 
-#: model_utils.cpp:246
-msgid "new_usecase"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "ny_pakke"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "ny_komponent"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nytt_punkt"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nytt"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Vis"
+
+#: umbrelloui.rc:35
+#, no-c-format
+msgid "&Zoom"
 msgstr ""
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nytt_grensesnitt"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kode"
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "ny_datatype"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Aktivt språk"
 
-#: model_utils.cpp:260
-msgid "new_enum"
+#: 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:262
-msgid "new_entity"
+#: 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:264
-#, fuzzy
-msgid "new_folder"
-msgstr "nytt_punkt"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nytt_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Tom"
+#: 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
-#, fuzzy
-msgid "Malformed argument"
-msgstr "Malformatert 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"
-msgstr "Ukjent argumenttype"
+#: 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"
-msgstr "Ulovlig navn på metode"
+#: 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"
-msgstr "Ukjent tilbakemeldingstype"
+#: 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"
-msgstr "Uspesifisert feil"
+#: 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
-#, fuzzy, 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 ""
-"Kunne ikke opprette mappen:\n"
 
-#: 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 "folder"
diff --git a/tde-i18n-nds/messages/tdesdk/umbrello.po b/tde-i18n-nds/messages/tdesdk/umbrello.po
index 33074c0d5b0..5ee128a488a 100644
--- a/tde-i18n-nds/messages/tdesdk/umbrello.po
+++ b/tde-i18n-nds/messages/tdesdk/umbrello.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-12-29 23:49+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -15,249 +15,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "De egenstahn Kode-Opsteller vun den UML-Modellmaker Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Datei, de ümwannelt warrn schall"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "De XSLT-Datei, de bruukt warrn schall"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (ok Kleag nöömt), (c) 2002-2006 De Schrievers vun "
-"den UML-Modellmaker Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Schrievers vun den UML-Modellmaker Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Manfred Wiese, Sönke Dibbern"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "All Ansichten warrt exporteert..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "m.j.wiese@web.de, s_dibbern@web.de"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Dat hett en poor Fehlers bi't Exporteren vun de Biller geven:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Aktiviteetnaam ingeven"
 
-#: 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 "Dat geev en Probleem bi't Sekern vun Datei \"%1\""
+#: 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 "Giff den Naam för de niege Aktiviteet in:"
 
-#: 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 "Fehler bi't Sekern"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Links utrichten"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Rechts utrichten"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synkroon Naricht"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Baven utrichten"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynkroon Naricht"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Nerrn utrichten"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Toornen"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Pielliek in de Merrn utrichten"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Schell"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Waagrecht in de Merrn utrichten"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Anker"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Pielliek opdeelt utrichten"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Beteken"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Waagrecht opdeelt utrichten"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Anmarken"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"För't Utrichten muttst Du tominnst twee Objekten utsöken, t.B. Klassen oder "
+"Aktören. Toornen laat sik nich utrichten."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Rahmen"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formateren"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktöör"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Afhängigkeit"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generaliseren"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Tosamenstellen"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Betog"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Richt Toornen"
-
-# vörlöpig
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Sett üm (Generaliseren/Realiseren)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Tosamensetten"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Bruukbispeel"
-
-#. 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 "Klass"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Anfangtostand"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Enntostand"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Tweel/Tosamenföhren"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Gaveln/Tosamenfögen"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponent"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Knütt"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Afhängigkeit"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Toornen"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Koppelsteed"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Sülvst-Toornen"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datentyp"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Tosamenarbeit-Naricht"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Optellen"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Reegnaricht"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Eenheit"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Tosamenarbeit-Egennaricht"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Deep Vörgeschicht"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Reeg-Egennaricht"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Siet Vörgeschicht"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Schell"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Tosamenfögen"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Tosamensetten"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Gaveln"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realiseren"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Verbinnen"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Allgemeen Toornen"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Utwahl"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Anker"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Tostand-Övergang"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Aktiviteet-Övergang"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktiviteet"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Tostand"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Veeltall"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Ennaktiviteet"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Veeltall ingeven:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Anfangaktiviteet"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Toornen-Naam"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Naricht"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Toornnaam ingeven:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "Nich fastleggt"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rullnaam"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Utsöken"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Rullnaam ingeven:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Dat gifft al en Akschoon mit den sülven Naam un de sülve Signatuur. Du "
+"kannst ehr nich nochmaal tofögen."
+
+#: 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 "Dat is en leeg Naam."
+
+#: 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 "Leeg Naam"
+
+#: 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 "De Naam warrt al bruukt."
+
+#: 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 "Keen eensoortet Naam"
 
 #: 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."
+"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 ""
-"Tominnst een Element in de Twischenaflaag lett sik nich infögen, wiel dat al en "
-"Element mit den sülven Naam gifft. All anner Elementen wöörn inföögt."
+"Tominnst een Element in de Twischenaflaag lett sik nich infögen, wiel dat al "
+"en Element mit den sülven Naam gifft. All anner Elementen wöörn inföögt."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -276,10 +235,8 @@ msgid "Cannot Open File"
 msgstr "Datei lett sik nich opmaken"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Orner lett sik nich opstellen:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Orner lett sik nich opstellen:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -293,1351 +250,1525 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Orner lett sik nich opstellen"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Tostandnaam ingeven"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Allgemeen Optschonen"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Giff den Naam vun den niegen Tostand in:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paket is en Naamruum"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Aktiviteet ingeven"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuell Destruktoren"
 
-#: 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 "Giff den Naam för de niege Aktiviteet in:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Leddig Konstruktoren opstellen"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "Nieg Aktiviteet"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Togriepmetoden opstellen"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-Modell"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Akschonen sünd binnenreegs"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logisch Ansicht"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Togriepers sünd binnenreegs"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Bruukbispeel-Ansicht"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Togriepers sünd apen"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponenten-Ansicht"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Datei warrt importeert: %1 Vörankamen: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Insetten-Ansicht"
+#: 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 "Fardig."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Eenheitenbetog-Modell"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Is dat Rebeet \"%1\" en Naamruum oder en Klass?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datentypen"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "\"C++\"-Import bruukt Dien Hülp"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"De aktuelle Datei wöör ännert.\n"
-"Wullt Du ehr sekern?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Naamruum"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "De Datei \"%1\" gifft dat nich."
+#: 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 "Klass"
 
-#: 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 "Fehler bi't Laden"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Intern Fehler"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "As dat lett is de Datei \"%1\" schaadhaftig."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntaxfehler vör \"%1\""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Binnen de komprimeerte Datei \"%1\" lett sik keen XMI-Datei finnen."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Inleesfehler vör \"%1\""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Dat geev en Probleem bi't Laden vun de ruttrocken Datei \"%1\""
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Dat geev en Probleem bi't Laden vun Datei \"%1\""
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "Utdruck verwacht"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Dat geev en Probleem bi't Hoochladen vun Datei \"%1\""
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Verklorensyntax-Fehler"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "Bruukbispeel-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "\"}\" verwacht"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Klass-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "Naamruum verwacht"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "Reeg-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "\"{\" verwacht"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "Tosamenarbeit-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Naam för Naamruum verwacht"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "Tostand-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Typbeteker för Verkloren deit noot"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "Aktiviteet-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "Verkloren verwacht"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "Komponenten-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Konstant Utdruck verwacht"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "Instten-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "\")\" verwacht"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "Eenheitenbetog-Diagramm"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "\"}\" fehlt"
 
-#: 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 "Naam"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Maat-Torechtmakers verwacht"
 
-#: 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 "Naam ingeven:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Basisklassbeteker verwacht"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Dat is en leeg Naam för en Diagramm."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Torechtmaker-Afsnitt verwacht"
 
-#: 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 "Leeg Naam"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Beteker verwacht"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "En Diagramm bruukt den Naam al."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Typ-ID verwacht"
 
-#: 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 "Keen eensoortet Naam"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Klassnaam verwacht"
 
-#: 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 "Dat is en leeg Naam."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "Bedingen verwacht"
 
-#: 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 "De Naam warrt al bruukt."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "Befehl verwacht"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Du hest en nich eensoortet Naam ingeven.\n"
-"Wullt Du dat redig so?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "\"for\"-Torechtmaken verwacht"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nich eensoortet Naam"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "\"catch\" verwacht"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Naam bruken"
+#: 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 "&Egenschappen"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Nieg Naam ingeven"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Anfangaktiviteet"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Wullt Du Diagramm \"%1\" redig wegdoon?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Ennaktiviteet"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Diagramm wegdoon"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Tweel/Tosamenföhren"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Dokment waart torechtmaakt..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Gaveln/Tosamenfögen"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Objektbetöög warrt oplööst..."
+#: 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 "Allgemeen"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML-Elementen warrt laadt..."
+#: 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 "Allgemeen Egenschappen"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Diagrammen warrt laadt..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Aktiviteet-Typ:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "TDE-UML-Diagramm"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Aktiviteet-Naam:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Dokmentatschoon"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Orner utlagern"
+#: 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 "Schriftoort:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Modellnaaam ingeven"
+#: 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 "Schriftoort-Instellen"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Giff den niegen Naam för dat Modell in:"
+#: 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 "Klöör"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Ansichten"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Elementklören"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Du hest en leeg Naam ingeven.\n"
-"Opstellperzess wöör afbraken."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktiviteten"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Leeg Naam"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nieg Aktiviteet..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Du hest en nich eensoortet Naam ingeven.\n"
-"Opstellperzess wöör afbraken."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Anker wegdoon"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Opstellen afbraken"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Ümnömen"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Listansicht warrt laadt..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nieg Aktiviteet"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "De Orner mutt ehr't Wegdoon leddig maakt warrn."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "Nieg Aktiviteet"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Orner nich leddig"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Aktiviteet ümnömen"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Dat gifft al en Akschoon mit den sülven Naam un de sülve Signatuur. Du kannst "
-"ehr nich nochmaal tofögen."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Giff den niegen Naam för de Aktiviteet in:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Aktiviteetnaam ingeven"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Naam:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "Nieg Tostand"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Typ:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generaliseren"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Toornen"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Sülvst-Toornen"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Toornen-Egenschappen"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Tosamenarbeit-Naricht"
+#: 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 "Allgemeen Instellen"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Reegnaricht"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Rullen"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Tosamenarbeit-Egennaricht"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rull-Instellen"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Reeg-Egennaricht"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Toornen-Schriftoort"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realiseren"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Egenschappen vun Rull A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Allgemeen Toornen"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Egenschappen vun Rull B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exporteren"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Sichtborkeit vun Rull A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagramm"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Sichtborkeit vun Rull B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nieg"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Ännerborkeit vun Rull A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Wiesen"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Ännerborkeit vun Rull B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kode"
+msgid "Rolename:"
+msgstr "Rullnaam:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Aktiv Spraak"
+msgid "Multiplicity:"
+msgstr "Veeltall:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokmentatschoon"
+msgid "Public"
+msgstr "Apen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "2 Dwarsstreken (//)"
+msgid "Private"
+msgstr "Privaat"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Dwarsstreek-Steern (/**  */)"
+msgid "Protected"
+msgstr "Schuult"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+msgid "Implementation"
+msgstr "Ümsetten"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">\"C++\"-Kodeopstellen</p>"
+msgid "Changeable"
+msgstr "Ännerbor"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Allgemeen"
+msgid "Frozen"
+msgstr "Infroren"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Opstellen vun Metood-Hööftdeel"
+msgid "Add only"
+msgstr "Bloots tofögen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Disse Klassen binnen den opstellten Kode bruken:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Klass&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Aktöör&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Paket&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variable</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Bruukbispeel&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Koppelsteed&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponent&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artefakt&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Tekenkeed</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Optell&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datentyp&naaam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Eenheit&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globaal?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Stereot&ypnaam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Paketnaam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klassnaam"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&fstrakt Klass"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\"><b>Koppdatei</b></p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&fstrakt Bruukbispeel"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projektopstellen"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Utföhrbor"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "ANT-Opstelldokment opstellen"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Teken as"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Metoden automaatsch opstellen"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Standard"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Leddig Konstruktormetoden"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Utfüllen:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Toornen-Togriepmetoden"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Bibliotheek"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Attribut-Togriepmetoden"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabell"
 
-#. 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 "Apen"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Sichtborkeit"
 
-#. 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 "Privaat"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Apen"
 
-#. 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 "Schuult"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivaat"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Vun överornt Objekt"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&Schuult"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Standard-Attributtogrieprebeet:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Ü&msetten"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Standard-Toornenfeldrebeet:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klassnaam:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Vun överornt Rull"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Utgaavnaam:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java-Kodeopstellen</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "As Aktöör teken"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Gadderteken (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Mehr Utgaven"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Anfang-Enn (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Destrukschoon wiesen"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby-Kodeopstellen</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponentnaam:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Knüttnaam:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotypnaam:"
+
+#: 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 ""
+"De Naam, den Du utsöcht\n"
+"hest, warrt al bruukt.\n"
+"De Naam wöör torüchsett."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Naam is nich eensoortet"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attributen"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Nieg Attribut..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Akschonen"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "&Nieg Akschoon..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Vörlagen"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "&Nieg Vörlaag..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Optell-Betekers"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "&Nieg Optell-Beteker..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Eenheiten-Attributen"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "&Nieg Eenheiten-Attribut..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Anker wegdoon"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Egenschappen"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Wiesen"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Akscho&nen"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Sichtborkeit"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "&Akschoonsignatuur"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributen"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&yp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibutsignatuur"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "As Krink teken"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Dorstellen"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Dorstelloptschonen"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribut-Instellen"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Akschoon-Instellen"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Vörlagen-Instellen"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Optellbeteker-Instellen"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Eenheitenattribut-Instellen"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Schell"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Inholt-Instellen"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klasstoornen"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nieg_klass"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nieg Klass"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klassattributen"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klassakschonen"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Kodeopstell-Optschonen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Spraak"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Opstellen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Ornern"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Fardig"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Orner för opstellt Dateien:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kode opstellt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Utsöken..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Nich opstellt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "U&tsöken..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Noch nich opstellt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "Koppdateien binnen dissen &Orner bruken:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Den Orner \"%1\" gifft dat nich. Wullt Du em nu opstellen?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"De vun den Kode-Opsteller opstellten Dateien warrt na dissen Orner schreven"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Den Utgaavorner gifft dat nich"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Orner opstellen"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Nich opstellen"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Dateien in dissen Orner warrt as Koppdateien för den opstellten Kode bruukt"
+"De Orner lett sik nich opstellen.\n"
+"Bitte prööv, wat Du Schriefverlööf för em sien överornt Orner hest oder söök "
+"en anner, gellen Orner ut."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Överschriev-Regeln"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Orner-Opstellen fehlslaan"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Bitte en gellen Orner utsöken."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Wenn dat al en Datei mit den sülven Naam gifft, den ok\n"
-"de Naam-Kodeopsteller för sien Utgaavdatei bruken will:"
+"Den Utgaavorner gifft dat, man he is nich schriefbor.\n"
+"Bitte stell de passen Verlöven in, oder söök en anner Orner ut."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Ö&verschrieven"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Fehler bi't Schrieven na Utgaavorner"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Dateien överschrieven, wenn se dat al binnen den Teelorner gifft"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "As dat lett is \"%1\" keen Orner. Bitte söök en gellen Orner ut."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Nafragen"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Bitte en gellen Orner utsöken"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Wenn dat al en Datei mit den sülven Naam gifft, nafragen, wat to doon is"
+msgid "Code Viewer"
+msgstr "Kodekieker"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Anner Naam &bruken"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Keen Optschonen verföögbor.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Wenn dat de Datei al binnen den Teelorner, dör Tofögen vun en Dateiennen en "
-"annern Naam utsöken, de bruukt warrn schall"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formateren"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Regen"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Aktuell Diagramm"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Reeg-Ennstil:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&All Diagrammen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Inrücktyp:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "Diagrammen &utsöken"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Inrückbreed:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "Diagramm&typ"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Utwahl"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Bruukbispeel"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Tosamenarbeit"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Reeg"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Tostand"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponent"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Insetten"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "TDE-UML-Diagramm"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Keen Diagrammen utsöcht."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Dat Formaat, na dat de Biller exporteert warrt"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Notizdokmentatschoon"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Teeldatei gifft dat al"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"De Datei \"%1\" gifft dat al binnen \"%2\".\n"
+"\n"
+"Umbrello kann de Datei överschrieven, en Naam liek\n"
+"to dissen bruken, oder disse Datei nich opstellen."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Macintosh (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "Op all övrige Dateien &anwennen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Keen Inrücken"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Ö&verschrieven"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulator"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "Liek Dateinaam &opstellen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Leerteken"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Datei nich &opstellen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Kommentar-Snackhaftigkeit"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameter-Egenschappen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "Kommentaren för &Afsneed infögen, ok wenn leddig"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Typ:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Naam:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Anfangweert:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Övergevenricht"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Schrifft Kommentaren för't Markeren vun de verscheden Afsneed (apen, privaat, "
-"usw.) binnen en Klass, ok wenn de Afsneed leddig sünd"
+"\"in\" bedüüdt \"bloots lesen\", \"out\" bedüüdt \"bloots schrieven\", un "
+"\"inout\" steiht för \"lesen un schrieven\"."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Dokmentatschoon-Anmarken infögen, ok wenn leddig"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Bargt Elementen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Schrifft Kommentaren för Klass- un Metood-Dokmentatschonen, ok wenn se leddig "
-"sünd"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Akschoon utwählen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Spraakoptschonen"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Reegnummer:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Kodeopstell-Hölper"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klassakschoon:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Klassen utwählen"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Egen Akschoon:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Umbrello-Instellen"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Böversiet"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Böversiet-Instellen"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Lienenklöör:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Standardklöör"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Füllklöör:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Stan&dardklöör"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Lienenbreed:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "&Standardbreed"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Rebeden utfüllen"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Verschuuv all Klassen, för de Du Kode opstellen wullt,\n"
-"na de List rechterhand"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Klass na Kodeopstell-List tofögen"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Torüchnehmen anmaken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Utsöcht Klassen"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Paneels bruken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Klass ut Kodeopstell-List wegmaken"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Nieg \"C++\"-/\"Java\"-/\"Ruby\"-Opstellers bruken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Verföögbor Klassen"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Eckig Toornenregen bruken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Kodeopstell-Status"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automaatsch sekern"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Drück op den Opstellen-Knoop, wenn Du den Kode nu opstellen wullt"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Automaatsch sekern a&nmaken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Opstellstatus"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Automaatsch Sekern all (Minuten):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kodekieker"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Dateiennen för't Automaatsche Sekern:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Versteken Blöck wiesen"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>De automaatsch sekerte Datei warrt as \"~/autosave.xmi\" opstellt, "
+"wenn Du de Datei vördem nich al vun Hand sekert hest.</p><p>Hest Du ehr al "
+"vun Hand sekert, warrt se mit den sülven Naam na den sülven Orner sekert, "
+"man mit de angeven Dateiennen.</p><p>Wenn disse Ennen de sülve is as de vun "
+"de sekerte Datei, warrt Dien Datei överschreven.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">hier de Komponent-Naam</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Start"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Blocktyp wiesen"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Sta&rtlogo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Klören"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Tipp för Vundaag"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Schriftoort:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Verleden Projekt laden"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Achtergrund:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Nieg Projekt starten mit:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Utsöcht:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Keen Diagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML-Objektblock:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klass-Diagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Versteken Block:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Bruukbispeel-Diagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Nich ännerbor Text:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Reeg-Diagramm"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Ännerbor Text:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Tosamenarbeit-Diagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagramm-Egenschappen"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Tostand-Diagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Naam:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Aktiviteet-Diagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Ansichtgrött:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponenten-Diagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Insetten-Diagramm"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klass-Instellen"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "&Sichtborkeit wiesen"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Attributen wiesen"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Akschonen wiesen"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Stereo&typ wiesen"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Attributsignatuur wiesen"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Paket wiesen"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Akschoonsignatuur wiesen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "&Gadder wiesen"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Startrebeet"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Backig Gadder"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Standard-Attributrebeet:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Backig Komponentgrött"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Standard-Akschoonrebeet:"
 
-#. 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."
-msgstr ""
-"De Komponent-Ecken fallt jümmers mit en Gadderknütt tosamen.\n"
-"Wenn ok \"Backig Gadder\" anmaakt is, is en Komponent jümmers op all veer "
-"Sieden an't Gadder utricht."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kodeopstellen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Gadderafstand:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Kodeopstell-Instellen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Kodekieker-Instellen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Anfangtostand"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Reegbreed:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Enntostand"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "All Ansichten exporteren"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tostandtyp:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Orner för't Sekern vun Diagrammen:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Tostandnaam:"
 
-#. 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"
-msgstr "Basisorner för't Sekern vun Biller"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Elementklöör"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Bildtyp:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attributegenschappen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Dat Formaat, na dat de Biller exporteert warrt"
+# vörlöpig
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Klassifikater-&Rebeet (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "&Ornern bruken"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Apen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Binnen den Teelorner de sülve Boomstruktuur bruken,\n"
-"as för't Sekern vun de Ansichten in't Dokment"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Schuult"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "Ü&msetten"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Du hest en leeg Attributnaam ingeven."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Leeg Attributnaam"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"De Ansichten warrt in Ornern binnen dat Dokment sekert. Mit disse Optschoon "
-"lett sik binnen den utsöcht Basisorner de sülve Boomanornen opstellen, as se ok "
-"binnen dat Dokment bruukt warrt.\n"
-"Bloots de vun den Bruker opstellten Ornern warrt ok binnen den Basisorner "
-"opstellt. (Logisch Ansicht, Bruukbispeel-Ansicht usw. warrt nich opstellt)."
+"De Attributnaam, den Du utsöcht hest, warrt al binnen disse Akschoon bruukt."
 
-# vörlöpig
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Rull-Egenschappen"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attributnaam nich eensoortet"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rullnaam:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Eenheitenattribut-Egenschappen"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Veeltall:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Standardweert:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Rull-Ännerborkeit"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Längde/Weerten:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Bloots tofögen"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automaatsch Towass"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Infroren"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "&Null tolaten"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Ännerbor"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributen:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Rull-Sichtborkeit"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indizeren"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Ümsetten"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Keen"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Willkamen bi Umbrello.</p>\n"
-"<p>Mit UML-Diagrammen kannst Du objektorienteert Programmen vörplanen un "
-"dokmenteren. <a href=\"help:/umbrello\">Dat Umbrello-Handbook</a> "
-"is en goot Inföhren för den Bruuk vun UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Toeerst"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Willkamen bi Umbrello 1.5. Nieg in disse Verschoon sünd Toornen-Klassen, "
-"\"Ruby\"-Kodeopstellen, utlagerbor Ornern, de Mööglichkeit, Koppelsteden na "
-"Klassen to ännern, un mehr.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Diagrammen mit Paneels un utlagert Ornern sluut enanner ut. Wenn Du utlagert "
-"Ornern bruken muttst, maak &quot;Paneels bruken&quot; in de allgemeen Instellen "
-"ut.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Eensoortet"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>De Grött vun de mehrsten Elementen lett sik nich ännern, wiel se sik na ehr "
-"Inholt sülvst topasst.\n"
-"De Grött vun Rahmens, Anmarken un Reegdiagrammnarichten lett sik ännern, wenn "
-"Du eenfach dat rode Rechteck anklickst un treckst.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Du hest en leeg Eenheiten-Attributnaam ingeven."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Wenn Du en al vörhannen Klass na en Diagramm tofögen wullt, treck ehr ut de "
-"Boomansicht na't Diagramm.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Leeg Eenheitenattributnaam"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Mit Umbrello sien Ümfaktoreer-Hölper kannst Du Akschonen\n"
-"twischen en Klass un ehr afleddt un Basis-Klassen verschuven.\n"
-"Mit en Rechtsklick op en Klass kannst Du den Ümfaktoreer-Hölper opropen.</p>\n"
+"De Eenheitenattributnaam, den Du utsöcht hest, warrt al binnen disse "
+"Akschoon bruukt."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Reegdiagramm-Objekten köönt en Destruktor-Rahmen hebben un laat sik as "
-"Aktören wiesen.\n"
-"Mit en Dubbelklick lett sik de Egenschappen-Dialoog opropen.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Eenheitenattributnaam nich eensoortet"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Reegdiagramm-Narichten laat sik as Konstruktoren bruken. Klick op den "
-"Objektrahmen (ansteed op de piellieke Lien), wenn Du dat wullt.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Akschoon-Egenschappen"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Reegdiagrammen ünnerstütt Narichten na sik sülven. Wenn Du en automaatsch "
-"Naricht opstellen wullt, klick nochmaal op de sülve piellieke Lien.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Afstrakt Akschoon"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Wenn na't Laden vun en Frömddatei nix binnen de Listansicht wiest warrt, "
-"seker dat Modell ünner en anner Naam, maak dat to, un laad de sekerte Datei "
-"nieg. Normalerwies warrt de Listansicht denn propper wiest.</p>\n"
+# vörlöpig
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Anfraag (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Knippen un Koperen exporteert dat Bild ok in PNG-Formaat na de "
-"Twischenaflaag, dat lett sik denn na KWord un anner Programmen infögen.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parameters"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Toornen bruukt nich jümmers graad Lienen wesen, en Dubbelklick dor op stellt "
-"en Treckpunkt op.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "&Nieg Parameter..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Du kannst binnen den Instelldialoog vun Umbrello automaatsch Sekern "
-"anmaken.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Du hest en leeg Parameternaam ingeven."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Fehlt en Funkschoon in Umbrello, de Du bruukst? Denn segg uns dat bitte.\n"
-"Föög Dien Wunsch mit de Fehlerberichtfunkschoon binnen dat Hülpmenü na\n"
-"de Fehlerdatenbank to, oder senn em na de Nettpostlist vun de "
-"Umbrello-Schrievers:</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Leeg Parameternaam"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Du kannst all utsöcht Objekten mit \"Entf\" oder mit de Torüchtast "
-"wegdoon.</p>\n"
+"De Parameternaam, den Du utsöcht hest,\n"
+"warrt al binnen disse Akschoon bruukt."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Wenn Du en Fehler in Umbrello funnen hest, giff uns bitte Bescheed.\n"
-"Bruuk dor de Fehlerberichtfunkschoon binnen dat Hülpmenü för.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameternaam nich eensoortet"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Mit de \"Escape\"-Tast kannst Du dat Utsöök-Warktüüch aktiveren.\n"
-"De Torüchtast jumpt na dat vördem bruukte Warktüüch.</p>\n"
+"De Parameternaam, den Du utsöcht hest, warrt al binnen disse Akschoon bruukt."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Du hest en leeg Akschoonnaam ingeven."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Leeg Akschoonnaam"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Dat gifft al en Akschoon mit disse Signatuur in \"%1\".\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Söök en anner Naam oder Parameterlist ut."
+
+# vörlöpig
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Rull-Egenschappen"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Vörlaag-Egenschappen"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Du hest en leeg Vörlaagnaam ingeven."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Leeg Vörlaagnaam"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Du kannst all Objekten mit Strg+A op eenmaal utsöken.</p>\n"
+"De Vörlaag-Parameternaam, den Du utsöcht hest, warrt al binnen disse "
+"Akschoon bruukt."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Vörlaagnaam nich eensoortet"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Klass-Dorstelloptschonen"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagrammklören"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Du hest en leeg Naam ingeven."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Du hest en nich eensoortet Naam ingeven."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nich eensoortet Naam"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Lienenklöör:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Utfüllen:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Standard"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "Rebeden u&tfüllen"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "All Ansichten warrt exporteert..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Dat hett en poor Fehlers bi't Exporteren vun de Biller geven:"
+
+#: 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 "Dat geev en Probleem bi't Sekern vun Datei \"%1\""
 
-#: tips.txt:108
+#: 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 "Fehler bi't Sekern"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "De egenstahn Kode-Opsteller vun den UML-Modellmaker Umbrello"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Datei, de ümwannelt warrn schall"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "De XSLT-Datei, de bruukt warrn schall"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Du kannst mit den \"Nieg Klass\"-Hölper binnen dat \"Kode\"-Menü en nieg "
-"Klass op- un instellen.</p>\n"
+"(c) 2006 Gael de Chalendar (ok Kleag nöömt), (c) 2002-2006 De Schrievers vun "
+"den UML-Modellmaker Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Schrievers vun den UML-Modellmaker Umbrello"
+
+#: 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 "Naam"
+
+#: 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 "Naam ingeven:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Akschoonnaam ingeven:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Nieg Text ingeven:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "Fehler"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Text ännern"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "De Ornerdatei \"%1\" gifft dat nich."
+
+#: 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 "Fehler bi't Laden"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "De Ornerdatei \"%1\" lett sik nich opmaken."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1691,6 +1822,10 @@ msgstr "Nieg Akschoon..."
 msgid "Select Operation..."
 msgstr "Akschoon utsöken..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Text ännern..."
@@ -1742,6 +1877,19 @@ msgstr "Nieg"
 msgid "Rename..."
 msgstr "Ümnömen..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Inföög-Fehler"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Lienenklöör..."
@@ -1770,14 +1918,26 @@ msgstr "Orner inlagern"
 msgid "Import Classes..."
 msgstr "Klassen importeren..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Ünnersysteem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponenten-Diagramm..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Knütt"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Insetten-Diagramm..."
@@ -1786,10 +1946,18 @@ msgstr "Insetten-Diagramm..."
 msgid "Folder"
 msgstr "Orner"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Eenheit"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Eenheitenbetog-Diagramm..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktöör"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Bruukbispeel-Diagramm..."
@@ -1826,6 +1994,18 @@ msgstr "Nieg Eenheitattribut..."
 msgid "Export as Picture..."
 msgstr "As Bild exporteren..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Koppelsteed"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datentyp"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Optellen"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klass-Diagramm..."
@@ -1846,26 +2026,10 @@ msgstr "Reeg-Diagramm..."
 msgid "Collaboration Diagram..."
 msgstr "Tosamenarbeit-Diagramm..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attributen"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Akschonen"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Bloots apen"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Sichtborkeit"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Akschoonsignatuur"
@@ -1878,11 +2042,6 @@ msgstr "Attributsignatuur"
 msgid "Stereotype"
 msgstr "Stereotyp"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Wiesen"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribut..."
@@ -1907,14 +2066,6 @@ msgstr "Füllklöör..."
 msgid "Use Fill Color"
 msgstr "Rebeden utfüllen"
 
-#: 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 "Klöör"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktöör..."
@@ -1943,10 +2094,26 @@ msgstr "Optellen..."
 msgid "Package..."
 msgstr "Paket..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Anfangtostand"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Enntostand"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Tostand..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Anfangaktiviteet"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Ennaktiviteet"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Ünnersysteem..."
@@ -1991,6 +2158,14 @@ msgstr "Anker wegdoon"
 msgid "Change Association Name..."
 msgstr "Toornennaam ännern..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Diagramm leddig maken"
@@ -2025,8 +2200,8 @@ msgstr "De Datei ehr Orner"
 
 #: 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 ""
 "Binnen den Teelorner de sülve Boomstruktuur bruken, as för't Sekern vun de "
 "Ansichten in't Dokment"
@@ -2037,191 +2212,94 @@ msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 Schrievers vun den UML-Modellmaker "
 "Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Leeg Bruuk vun Toornen."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Toornenfehler"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "De Ornerdatei \"%1\" gifft dat nich."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "De Ornerdatei \"%1\" lett sik nich opmaken."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Manfred Wiese, Sönke Dibbern"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "m.j.wiese@web.de, s_dibbern@web.de"
-
-#: 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 "Fardig."
-
-#: 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 ""
-"Mit daalhollen Ümschalt- oder Strg-Tast kannst Du langs de X-Ass, mit "
-"daalhollen Ümschalt+Strg-Tasten langs de de Y-Ass verschuven. Mit en "
-"Rechtsklick lett sik dat Verschuven afbreken."
-
-#: 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 ""
-"Mit daalhollen Ümschalt- oder Strg-Tast kannst Du langs de X-Ass, mit "
-"daalhollen Ümschalt+Strg-Tasten langs de de Y-Ass verschuven. Mit en "
-"Rechtsklick lett sik dat Ännern vun de Grött afbreken."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Is dat Rebeet \"%1\" en Naamruum oder en Klass?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "\"C++\"-Import bruukt Dien Hülp"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Naamruum"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Datei warrt importeert: %1 Vörankamen: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Intern Fehler"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntaxfehler vör \"%1\""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Inleesfehler vör \"%1\""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nieg_aktöör"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "Utdruck verwacht"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nieg_bruukbispeel"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Verklorensyntax-Fehler"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nieg_paket"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "\"}\" verwacht"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nieg_komponent"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "Naamruum verwacht"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nieg_knütt"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "\"{\" verwacht"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nieg_artefakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Naam för Naamruum verwacht"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nieg_koppelsteed"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Typbeteker för Verkloren deit noot"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nieg_datentyp"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "Verkloren verwacht"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nieg_optellen"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Konstant Utdruck verwacht"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nieg_eenheit"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "\")\" verwacht"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nieg_orner"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "\"}\" fehlt"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nieg_toornen"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Maat-Torechtmakers verwacht"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nieg_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Basisklassbeteker verwacht"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Torechtmaker-Afsnitt verwacht"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Leddig"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Beteker verwacht"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Leegformt Argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Typ-ID verwacht"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Nich bekannt Argumenttyp"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Klassnaam verwacht"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Leeg Metoodnaam"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "Bedingen verwacht"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Nich bekannt Torüchgaavtyp"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "Befehl verwacht"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Nich angeven Fehler"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "\"for\"-Torechtmaken verwacht"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Dit is en schuult Slötelwoort vun den instellten Kode-Opsteller."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "\"catch\" verwacht"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Schuult Slötelwoort"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2235,106 +2313,66 @@ msgstr "Objektnaam ingeven:"
 msgid "new_parameter"
 msgstr "nieg_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Allgemeen Optschonen"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paket is en Naamruum"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuell Destruktoren"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Leddig Konstruktoren opstellen"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Togriepmetoden opstellen"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Akschonen sünd binnenreegs"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Togriepers sünd binnenreegs"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Togriepers sünd apen"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagramm: %2, Siet %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Diagrammnaam ingeven"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Basisklass tofögen"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Giff en nieg Naam för dat Diagramm in:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Afleddt Klass tofögen"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Du wullt dat hele Diagramm wegdoon.\n"
-"Büst Du seker?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Akschoon tofögen"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Diagramm wegdoon?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Attribut tofögen"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Ümnömen afbraken"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Basiskoppelsteed tofögen"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Dat Ümnömen vun en Indrag mit den Listansicht-Typ \"%1\" is noch nich inbuut."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Afleddt Koppelsteed tofögen"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkschoon nich inbuut"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Basis-Klassifikaters"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Du hest en leeg Naam ingeven.\n"
-"De Ümnöömperzess warrt afbraken."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Afleddt Klassifikaters"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nieg_toornen"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Tostandnaam ingeven"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nieg_attribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Giff den Naam vun den niegen Tostand in:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nieg_Vörlaag"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Aktiviteet ingeven"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nieg_akschoon"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Leeg Bruuk vun Toornen."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nieg_beteker"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Toornenfehler"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nieg_feld"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "Nieg Tostand"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2488,11 +2526,6 @@ msgstr "As Bild &exporteren..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "&All Diagrammen as Biller exporteren..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Egenschappen"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Schuver för't &Gröttännern"
@@ -2577,21 +2610,28 @@ msgstr "&Dokmentatschoon"
 msgid "Opening file..."
 msgstr "Datei warrt opmaakt..."
 
+#: 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 "Nieg Dokment warrt opstellt..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|All ünnerstütt Dateien (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|All ünnerstütt Dateien (*.xmi, *.xmi.tgz, *."
+"xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Nich komprimeert XMI-Dateien (*.xmi)\n"
 "*.xmi.tgz|Mit \"gzip\" komprimeert XMI-Dateien (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|mit \"bzip2\" komprimeert XMI-Dateien (*.xmi.tar.bz2)\n"
@@ -2621,6 +2661,10 @@ msgstr ""
 "*.xmi.tar.bz2|Mit \"bzip2\" komprimeert XMI-Datei\n"
 "*|All Dateien"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2629,6 +2673,10 @@ msgstr ""
 "De Datei \"%1\" gifft dat al.\n"
 "Wullt Du ehr överschrieven?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Överschrieven"
@@ -2664,11 +2712,12 @@ msgstr "Twischenaflaag-Inholt warrt inföögt..."
 
 #: 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 ""
-"Umbrello kann den Inholt vun de Twischenaflaag nich infögen. De Objekten in de "
-"Twischenaflaag hebbt villicht den falschen Typ för't Infögen an disse Steed."
+"Umbrello kann den Inholt vun de Twischenaflaag nich infögen. De Objekten in "
+"de Twischenaflaag hebbt villicht den falschen Typ för't Infögen an disse "
+"Steed."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2722,1267 +2771,1316 @@ msgstr "All Dateien"
 msgid "Select Code to Import"
 msgstr "Kode för't Importeren utsöken"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Klass&naam:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Aktöör&naam:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nieg_attribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Paket&naam:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nieg_Vörlaag"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Bruukbispeel&naam:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nieg_akschoon"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Koppelsteed&naam:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nieg_beteker"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponent&naam:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nieg_feld"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artefakt&naam:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-Modell"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Optell&naam:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logisch Ansicht"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datentyp&naaam:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Bruukbispeel-Ansicht"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Eenheit&naam:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponenten-Ansicht"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Stereot&ypnaam:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Insetten-Ansicht"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Paketnaam:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Eenheitenbetog-Modell"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&fstrakt Klass"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datentypen"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&fstrakt Bruukbispeel"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"De aktuelle Datei wöör ännert.\n"
+"Wullt Du ehr sekern?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Utföhrbor"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "De Datei \"%1\" gifft dat nich."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Teken as"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "As dat lett is de Datei \"%1\" schaadhaftig."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Standard"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Binnen de komprimeerte Datei \"%1\" lett sik keen XMI-Datei finnen."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Bibliotheek"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Dat geev en Probleem bi't Laden vun de ruttrocken Datei \"%1\""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabell"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Dat geev en Probleem bi't Laden vun Datei \"%1\""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Apen"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Dat geev en Probleem bi't Hoochladen vun Datei \"%1\""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivaat"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "Bruukbispeel-Diagramm"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&Schuult"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Klass-Diagramm"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Ü&msetten"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "Reeg-Diagramm"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klassnaam:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "Tosamenarbeit-Diagramm"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Utgaavnaam:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "Tostand-Diagramm"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "As Aktöör teken"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "Aktiviteet-Diagramm"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Mehr Utgaven"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "Komponenten-Diagramm"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Destrukschoon wiesen"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "Instten-Diagramm"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponentnaam:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "Eenheitenbetog-Diagramm"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Knüttnaam:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Dat is en leeg Naam för en Diagramm."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotypnaam:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "En Diagramm bruukt den Naam al."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"De Naam, den Du utsöcht\n"
-"hest, warrt al bruukt.\n"
-"De Naam wöör torüchsett."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Naam is nich eensoortet"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Lienenklöör:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Utfüllen:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Standard"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "Rebeden u&tfüllen"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktiviteten"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nieg Aktiviteet..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Ümnömen"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nieg Aktiviteet"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Aktiviteet ümnömen"
+"Du hest en nich eensoortet Naam ingeven.\n"
+"Wullt Du dat redig so?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Giff den niegen Naam för de Aktiviteet in:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Naam bruken"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Toornen-Egenschappen"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Nieg Naam ingeven"
 
-#: 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 "Allgemeen Instellen"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Wullt Du Diagramm \"%1\" redig wegdoon?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Rullen"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Diagramm wegdoon"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rull-Instellen"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Dokment waart torechtmaakt..."
 
-#: 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 "Schriftoort-Instellen"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Objektbetöög warrt oplööst..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Toornen-Schriftoort"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML-Elementen warrt laadt..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Vörlaag-Egenschappen"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Diagrammen warrt laadt..."
 
-#: 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 "Allgemeen Egenschappen"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Typ:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Orner utlagern"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Naam:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Modellnaaam ingeven"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Du hest en leeg Vörlaagnaam ingeven."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Giff den niegen Naam för dat Modell in:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Leeg Vörlaagnaam"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Ansichten"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"De Vörlaag-Parameternaam, den Du utsöcht hest, warrt al binnen disse Akschoon "
-"bruukt."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Vörlaagnaam nich eensoortet"
+"Du hest en leeg Naam ingeven.\n"
+"Opstellperzess wöör afbraken."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Eenheitenattribut-Egenschappen"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Leeg Naam"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Standardweert:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Du hest en nich eensoortet Naam ingeven.\n"
+"Opstellperzess wöör afbraken."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Längde/Weerten:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Opstellen afbraken"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automaatsch Towass"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Listansicht warrt laadt..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "&Null tolaten"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "De Orner mutt ehr't Wegdoon leddig maakt warrn."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributen:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Orner nich leddig"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indizeren"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Ümnömen afbraken"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Keen"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Dat Ümnömen vun en Indrag mit den Listansicht-Typ \"%1\" is noch nich inbuut."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Toeerst"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkschoon nich inbuut"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Du hest en leeg Naam ingeven.\n"
+"De Ümnöömperzess warrt afbraken."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Eensoortet"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagramm: %2, Siet %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Du hest en leeg Eenheiten-Attributnaam ingeven."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Diagrammnaam ingeven"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Leeg Eenheitenattributnaam"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Giff en nieg Naam för dat Diagramm in:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"De Eenheitenattributnaam, den Du utsöcht hest, warrt al binnen disse Akschoon "
-"bruukt."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Eenheitenattributnaam nich eensoortet"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Dorstellen"
+"Du wullt dat hele Diagramm wegdoon.\n"
+"Büst Du seker?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Klass-Dorstelloptschonen"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Diagramm wegdoon?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagrammklören"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Ansicht warrt exporteert..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Du hest en leeg Naam ingeven."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Dat hett en Fehler bi't Exporteren vun dat Bild geven:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Du hest en nich eensoortet Naam ingeven."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"De utsöcht Datei \"%1\" gifft dat al.\n"
+"Wullt Du ehr överschrieven?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Typ:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Gifft Datei al"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello-Instellen"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Orner \"%1\" lett sik nich opstellen"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Böversiet"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "En leddig Diagramm lett sik nich sekern"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Böversiet-Instellen"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Dat geev en Probleem bi't Sekern vun dat Diagramm na \"%1\""
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Lienenklöör:"
+#: 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 ""
+"Mit daalhollen Ümschalt- oder Strg-Tast kannst Du langs de X-Ass, mit "
+"daalhollen Ümschalt+Strg-Tasten langs de de Y-Ass verschuven. Mit en "
+"Rechtsklick lett sik dat Verschuven afbreken."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Standardklöör"
+#: 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 ""
+"Mit daalhollen Ümschalt- oder Strg-Tast kannst Du langs de X-Ass, mit "
+"daalhollen Ümschalt+Strg-Tasten langs de de Y-Ass verschuven. Mit en "
+"Rechtsklick lett sik dat Ännern vun de Grött afbreken."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Füllklöör:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Stan&dardklöör"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synkroon Naricht"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Lienenbreed:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynkroon Naricht"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "&Standardbreed"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Beteken"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Rebeden utfüllen"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Anmarken"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Torüchnehmen anmaken"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Rahmen"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Paneels bruken"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Betog"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Nieg \"C++\"-/\"Java\"-/\"Ruby\"-Opstellers bruken"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Richt Toornen"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Eckig Toornenregen bruken"
+# vörlöpig
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Sett üm (Generaliseren/Realiseren)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automaatsch sekern"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Deep Vörgeschicht"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Automaatsch sekern a&nmaken"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Siet Vörgeschicht"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Automaatsch Sekern all (Minuten):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Tosamenfögen"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Dateiennen för't Automaatsche Sekern:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Gaveln"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>De automaatsch sekerte Datei warrt as \"~/autosave.xmi\" opstellt, wenn Du "
-"de Datei vördem nich al vun Hand sekert hest.</p>"
-"<p>Hest Du ehr al vun Hand sekert, warrt se mit den sülven Naam na den sülven "
-"Orner sekert, man mit de angeven Dateiennen.</p>"
-"<p>Wenn disse Ennen de sülve is as de vun de sekerte Datei, warrt Dien Datei "
-"överschreven.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Verbinnen"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Start"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Utwahl"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Sta&rtlogo"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Aktiviteet-Övergang"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Tipp för Vundaag"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Naricht"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Verleden Projekt laden"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "Nich fastleggt"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Nieg Projekt starten mit:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Utsöken"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Keen Diagramm"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Klass-Diagramm"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Bruukbispeel-Diagramm"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Reeg-Diagramm"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Tosamenarbeit-Diagramm"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Akschonen wiesen"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Tostand-Diagramm"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Aktiviteet-Diagramm"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Diagramm leddig maken"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponenten-Diagramm"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Insetten-Diagramm"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generaliseren"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klass-Instellen"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "&Sichtborkeit wiesen"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Attributen wiesen"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Toornen-Naam"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Akschonen wiesen"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Stereo&typ wiesen"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Attributsignatuur wiesen"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Paket wiesen"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Standard"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Startrebeet"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Standard-Attributrebeet:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "2 Dwarsstreken (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Standard-Akschoonrebeet:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Dwarsstreek-Steern (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kodeopstellen"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Kodeopstell-Instellen"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">\"C++\"-Kodeopstellen</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Kodekieker-Instellen"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Opstellen vun Metood-Hööftdeel"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Akschoon-Egenschappen"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Disse Klassen binnen den opstellten Kode bruken:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Afstrakt Akschoon"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-# vörlöpig
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Klassifikater-&Rebeet (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-# vörlöpig
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Anfraag (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variable</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Schuult"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "Ü&msetten"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parameters"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Nieg Parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Tekenkeed</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Du hest en leeg Parameternaam ingeven."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">List</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Leeg Parameternaam"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"De Parameternaam, den Du utsöcht hest,\n"
-"warrt al binnen disse Akschoon bruukt."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globaal?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameternaam nich eensoortet"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"De Parameternaam, den Du utsöcht hest, warrt al binnen disse Akschoon bruukt."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klassnaam"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Du hest en leeg Akschoonnaam ingeven."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\"><b>Koppdatei</b></p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Leeg Akschoonnaam"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projektopstellen"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Dat gifft al en Akschoon mit disse Signatuur in \"%1\".\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "ANT-Opstelldokment opstellen"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Söök en anner Naam oder Parameterlist ut."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Metoden automaatsch opstellen"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Egenschappen vun Rull A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Leddig Konstruktormetoden"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Egenschappen vun Rull B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Toornen-Togriepmetoden"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Sichtborkeit vun Rull A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Attribut-Togriepmetoden"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Sichtborkeit vun Rull B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Vun överornt Objekt"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Ännerborkeit vun Rull A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Standard-Attributtogrieprebeet:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Ännerborkeit vun Rull B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Standard-Toornenfeldrebeet:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Bargt Elementen"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Vun överornt Rull"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Notizdokmentatschoon"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java-Kodeopstellen</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Nieg Attribut..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Gadderteken (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "&Nieg Akschoon..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Anfang-Enn (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Vörlagen"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby-Kodeopstellen</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "&Nieg Vörlaag..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Spraak"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Optell-Betekers"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Ornern"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "&Nieg Optell-Beteker..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Orner för opstellt Dateien:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Eenheiten-Attributen"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Utsöken..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "&Nieg Eenheiten-Attribut..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "U&tsöken..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Anfangaktiviteet"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "Koppdateien binnen dissen &Orner bruken:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Ennaktiviteet"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"De vun den Kode-Opsteller opstellten Dateien warrt na dissen Orner schreven"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Aktiviteet-Typ:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Dateien in dissen Orner warrt as Koppdateien för den opstellten Kode bruukt"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Aktiviteet-Naam:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Överschriev-Regeln"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Elementklören"
+#: 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 ""
+"Wenn dat al en Datei mit den sülven Naam gifft, den ok\n"
+"de Naam-Kodeopsteller för sien Utgaavdatei bruken will:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attributegenschappen"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Ö&verschrieven"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Anfangweert:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Dateien överschrieven, wenn se dat al binnen den Teelorner gifft"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Apen"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Nafragen"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Du hest en leeg Attributnaam ingeven."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Wenn dat al en Datei mit den sülven Naam gifft, nafragen, wat to doon is"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Leeg Attributnaam"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Anner Naam &bruken"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"De Attributnaam, den Du utsöcht hest, warrt al binnen disse Akschoon bruukt."
+"Wenn dat de Datei al binnen den Teelorner, dör Tofögen vun en Dateiennen en "
+"annern Naam utsöken, de bruukt warrn schall"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attributnaam nich eensoortet"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formateren"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Akschoon utwählen"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Regen"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Reegnummer:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Reeg-Ennstil:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klassakschoon:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Inrücktyp:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Egen Akschoon:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Inrückbreed:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammen"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Aktuell Diagramm"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Macintosh (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&All Diagrammen"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Keen Inrücken"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "Diagrammen &utsöken"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulator"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "Diagramm&typ"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Leerteken"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Utwahl"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Kommentar-Snackhaftigkeit"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Tosamenarbeit"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Kommentaren för &Afsneed infögen, ok wenn leddig"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Reeg"
+#: 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 ""
+"Schrifft Kommentaren för't Markeren vun de verscheden Afsneed (apen, "
+"privaat, usw.) binnen en Klass, ok wenn de Afsneed leddig sünd"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Insetten"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Dokmentatschoon-Anmarken infögen, ok wenn leddig"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Keen Diagrammen utsöcht."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Schrifft Kommentaren för Klass- un Metood-Dokmentatschonen, ok wenn se "
+"leddig sünd"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Dorstelloptschonen"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Spraakoptschonen"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribut-Instellen"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Kodeopstell-Hölper"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Akschoon-Instellen"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Klassen utwählen"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Vörlagen-Instellen"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Verschuuv all Klassen, för de Du Kode opstellen wullt,\n"
+"na de List rechterhand"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Optellbeteker-Instellen"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Klass na Kodeopstell-List tofögen"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Eenheitenattribut-Instellen"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Utsöcht Klassen"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Inholt-Instellen"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Klass ut Kodeopstell-List wegmaken"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Toornen"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Verföögbor Klassen"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klasstoornen"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Kodeopstell-Status"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Akscho&nen"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Drück op den Opstellen-Knoop, wenn Du den Kode nu opstellen wullt"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Sichtborkeit"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Opstellstatus"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "&Akschoonsignatuur"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Versteken Blöck wiesen"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ket"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">hier de Komponent-Naam</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributen"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&yp"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Blocktyp wiesen"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibutsignatuur"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Klören"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "As Krink teken"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Schriftoort:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Anfangtostand"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Achtergrund:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Enntostand"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Utsöcht:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tostandtyp:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML-Objektblock:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Tostandnaam:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Versteken Block:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Elementklöör"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Nich ännerbor Text:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nieg_klass"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Ännerbor Text:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nieg Klass"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagramm-Egenschappen"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klassattributen"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Ansichtgrött:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klassakschonen"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameter-Egenschappen"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "&Gadder wiesen"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Övergevenricht"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Backig Gadder"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Backig Komponentgrött"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" bedüüdt \"bloots lesen\", \"out\" bedüüdt \"bloots schrieven\", un "
-"\"inout\" steiht för \"lesen un schrieven\"."
+"De Komponent-Ecken fallt jümmers mit en Gadderknütt tosamen.\n"
+"Wenn ok \"Backig Gadder\" anmaakt is, is en Komponent jümmers op all veer "
+"Sieden an't Gadder utricht."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Opstellen"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Gadderafstand:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Fardig"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kode opstellt"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Nich opstellt"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Reegbreed:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Noch nich opstellt"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "All Ansichten exporteren"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Den Orner \"%1\" gifft dat nich. Wullt Du em nu opstellen?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Orner för't Sekern vun Diagrammen:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Den Utgaavorner gifft dat nich"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Basisorner för't Sekern vun Biller"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Orner opstellen"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Bildtyp:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Nich opstellen"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "&Ornern bruken"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"De Orner lett sik nich opstellen.\n"
-"Bitte prööv, wat Du Schriefverlööf för em sien överornt Orner hest oder söök en "
-"anner, gellen Orner ut."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Orner-Opstellen fehlslaan"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Bitte en gellen Orner utsöken."
+"Binnen den Teelorner de sülve Boomstruktuur bruken,\n"
+"as för't Sekern vun de Ansichten in't Dokment"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Den Utgaavorner gifft dat, man he is nich schriefbor.\n"
-"Bitte stell de passen Verlöven in, oder söök en anner Orner ut."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Fehler bi't Schrieven na Utgaavorner"
+"De Ansichten warrt in Ornern binnen dat Dokment sekert. Mit disse Optschoon "
+"lett sik binnen den utsöcht Basisorner de sülve Boomanornen opstellen, as se "
+"ok binnen dat Dokment bruukt warrt.\n"
+"Bloots de vun den Bruker opstellten Ornern warrt ok binnen den Basisorner "
+"opstellt. (Logisch Ansicht, Bruukbispeel-Ansicht usw. warrt nich opstellt)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "As dat lett is \"%1\" keen Orner. Bitte söök en gellen Orner ut."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Rull-Ännerborkeit"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Bitte en gellen Orner utsöken"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Rull-Sichtborkeit"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Teeldatei gifft dat al"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exporteren"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"De Datei \"%1\" gifft dat al binnen \"%2\".\n"
-"\n"
-"Umbrello kann de Datei överschrieven, en Naam liek\n"
-"to dissen bruken, oder disse Datei nich opstellen."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "Op all övrige Dateien &anwennen"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Ö&verschrieven"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "Liek Dateinaam &opstellen"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Datei nich &opstellen"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Keen Optschonen verföögbor.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Veeltall"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Veeltall ingeven:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Toornen-Naam"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Toornnaam ingeven:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rullnaam"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Rullnaam ingeven:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Akschoonnaam ingeven:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Nieg Text ingeven:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "Fehler"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Text ännern"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Links utrichten"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Rechts utrichten"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagramm"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Baven utrichten"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nieg"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Nerrn utrichten"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Wiesen"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Pielliek in de Merrn utrichten"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Ansichtgrött:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Waagrecht in de Merrn utrichten"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kode"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Pielliek opdeelt utrichten"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Aktiv Spraak"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Waagrecht opdeelt utrichten"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"För't Utrichten muttst Du tominnst twee Objekten utsöken, t.B. Klassen oder "
-"Aktören. Toornen laat sik nich utrichten."
+"<p>Willkamen bi Umbrello.</p>\n"
+"<p>Mit UML-Diagrammen kannst Du objektorienteert Programmen vörplanen un "
+"dokmenteren. <a href=\"help:/umbrello\">Dat Umbrello-Handbook</a> is en goot "
+"Inföhren för den Bruuk vun UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Dit is en schuult Slötelwoort vun den instellten Kode-Opsteller."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Schuult Slötelwoort"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Ansicht warrt exporteert..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Willkamen bi Umbrello 1.5. Nieg in disse Verschoon sünd Toornen-Klassen, "
+"\"Ruby\"-Kodeopstellen, utlagerbor Ornern, de Mööglichkeit, Koppelsteden na "
+"Klassen to ännern, un mehr.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Dat hett en Fehler bi't Exporteren vun dat Bild geven:\n"
+"<p>Diagrammen mit Paneels un utlagert Ornern sluut enanner ut. Wenn Du "
+"utlagert Ornern bruken muttst, maak &quot;Paneels bruken&quot; in de "
+"allgemeen Instellen ut.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"De utsöcht Datei \"%1\" gifft dat al.\n"
-"Wullt Du ehr överschrieven?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Gifft Datei al"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nieg_aktöör"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nieg_bruukbispeel"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nieg_paket"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nieg_komponent"
+"<p>De Grött vun de mehrsten Elementen lett sik nich ännern, wiel se sik na "
+"ehr Inholt sülvst topasst.\n"
+"De Grött vun Rahmens, Anmarken un Reegdiagrammnarichten lett sik ännern, "
+"wenn Du eenfach dat rode Rechteck anklickst un treckst.</p>\n"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nieg_knütt"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nieg_artefakt"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nieg_koppelsteed"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nieg_datentyp"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nieg_optellen"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nieg_eenheit"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nieg_orner"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nieg_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Leddig"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Leegformt Argument"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Nich bekannt Argumenttyp"
+#: 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 ""
+"<p>Wenn Du en al vörhannen Klass na en Diagramm tofögen wullt, treck ehr ut "
+"de Boomansicht na't Diagramm.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Leeg Metoodnaam"
+#: 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 ""
+"<p>Mit Umbrello sien Ümfaktoreer-Hölper kannst Du Akschonen\n"
+"twischen en Klass un ehr afleddt un Basis-Klassen verschuven.\n"
+"Mit en Rechtsklick op en Klass kannst Du den Ümfaktoreer-Hölper opropen.</"
+"p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Nich bekannt Torüchgaavtyp"
+#: 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 ""
+"<p>Reegdiagramm-Objekten köönt en Destruktor-Rahmen hebben un laat sik as "
+"Aktören wiesen.\n"
+"Mit en Dubbelklick lett sik de Egenschappen-Dialoog opropen.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Nich angeven Fehler"
+#: 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 ""
+"<p>Reegdiagramm-Narichten laat sik as Konstruktoren bruken. Klick op den "
+"Objektrahmen (ansteed op de piellieke Lien), wenn Du dat wullt.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Basisklass tofögen"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Reegdiagrammen ünnerstütt Narichten na sik sülven. Wenn Du en automaatsch "
+"Naricht opstellen wullt, klick nochmaal op de sülve piellieke Lien.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Afleddt Klass tofögen"
+#: 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 ""
+"<p>Wenn na't Laden vun en Frömddatei nix binnen de Listansicht wiest warrt, "
+"seker dat Modell ünner en anner Naam, maak dat to, un laad de sekerte Datei "
+"nieg. Normalerwies warrt de Listansicht denn propper wiest.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Akschoon tofögen"
+#: 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 ""
+"<p>Knippen un Koperen exporteert dat Bild ok in PNG-Formaat na de "
+"Twischenaflaag, dat lett sik denn na KWord un anner Programmen infögen.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Attribut tofögen"
+#: 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 ""
+"<p>Toornen bruukt nich jümmers graad Lienen wesen, en Dubbelklick dor op "
+"stellt en Treckpunkt op.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Basiskoppelsteed tofögen"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Du kannst binnen den Instelldialoog vun Umbrello automaatsch Sekern "
+"anmaken.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Afleddt Koppelsteed tofögen"
+#: 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 ""
+"<p>Fehlt en Funkschoon in Umbrello, de Du bruukst? Denn segg uns dat bitte.\n"
+"Föög Dien Wunsch mit de Fehlerberichtfunkschoon binnen dat Hülpmenü na\n"
+"de Fehlerdatenbank to, oder senn em na de Nettpostlist vun de Umbrello-"
+"Schrievers:</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Basis-Klassifikaters"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Du kannst all utsöcht Objekten mit \"Entf\" oder mit de Torüchtast "
+"wegdoon.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Afleddt Klassifikaters"
+#: 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 ""
+"<p>Wenn Du en Fehler in Umbrello funnen hest, giff uns bitte Bescheed.\n"
+"Bruuk dor de Fehlerberichtfunkschoon binnen dat Hülpmenü för.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Orner \"%1\" lett sik nich opstellen"
+#: 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 ""
+"<p>Mit de \"Escape\"-Tast kannst Du dat Utsöök-Warktüüch aktiveren.\n"
+"De Torüchtast jumpt na dat vördem bruukte Warktüüch.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "En leddig Diagramm lett sik nich sekern"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Du kannst all Objekten mit Strg+A op eenmaal utsöken.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Dat geev en Probleem bi't Sekern vun dat Diagramm na \"%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 ""
+"<p>Du kannst mit den \"Nieg Klass\"-Hölper binnen dat \"Kode\"-Menü en nieg "
+"Klass op- un instellen.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "nieg_stereotyp"
diff --git a/tde-i18n-nl/messages/tdesdk/umbrello.po b/tde-i18n-nl/messages/tdesdk/umbrello.po
index b9e372caca4..1dfca97870f 100644
--- a/tde-i18n-nl/messages/tdesdk/umbrello.po
+++ b/tde-i18n-nl/messages/tdesdk/umbrello.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-09-17 22:37+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -24,245 +24,205 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=n != 1;\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Autonome codegenerator voor Umbrello UML-modelleerder"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Om te zetten bestand"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Te gebruiken XSLT-bestand"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (Kleag), (c) 2002-2006 Auteurs van Umbrello "
-"UML-modelleerder"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "De auteurs van Umbrello UML Modeller"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Kris Luyten,Rinse de Vries,Ruurd Pels"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Alle weergaven exporteren..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kris.luyten@luc.ac.be,rinse@kde.nl,ruurd@tiscali.nl"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Er deden zich fouten voor bij het exporteren van de afbeeldingen:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Activiteitennaam invoeren"
 
-#: 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 "Er deed zich een fout voor tijdens het opslaan van bestand: %1"
+#: 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 "Geef de naam van de nieuwe activiteit:"
 
-#: 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 "Opslagfout"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Links uitlijnen"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Object"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Rechts uitlijnen"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synchroon bericht"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Boven uitlijnen"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynchroon bericht"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Onder uitlijnen"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Associatie"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Verticaal centreren"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Insluiting"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Horizontaal centreren"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Anker"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Verticaal verdeeld centreren"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Label"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Horizontaal verdeeld centreren"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Notitie"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Om uit te lijnen dient u tenminste twee objecten zoals klassen of actoren te "
+"selecteren. U kunt geen associaties uitlijnen."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Box"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Opmaak"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Afhankelijkheid"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisatie"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregatie"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relatie"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Directionele associatie"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementeert (generalisatie/realisatie)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Compositie"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Use Case"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Klasse"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Begintoestand"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Eindtoestand"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Vertakken/samenvoegen"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Afsplitsten/verenigen"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pakket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Component"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Knooppunt"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Afhankelijkheid"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefact"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Associatie"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interface"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Zelfassociatie"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Gegevenstype"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Collaboratieboodschap"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumeratie"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sequentieboodschap"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entiteit"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Collaboratieboodschap aan zichzelf"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Gedetailleerde geschiedenis"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sequentieboodscap aan zichzelf"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Oppervlakkige geschiedenis"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Insluiting"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Verenigen"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Compositie"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Afsplitsen"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisatie"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Knooppunt"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Algemene associatie"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Keuze"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Anker"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Toestandsovergang"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Activiteitsovergang"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Activiteit"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Toestand"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multipliciteit"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Eindactiviteit"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Multipliciteit invoeren:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Beginactiviteit"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Associatienaam invoeren"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Bericht"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Associatienaam invoeren:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "ONGEDEFINIEERD"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rolnaam"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Selecteren"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Rolnaam invoeren:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Een operatie met deze signatuur bestaat reeds. U kunt hem niet nogmaals "
+"toevoegen."
+
+#: 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 "Dat is een ongeldige naam."
+
+#: 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 "Ongeldige naam"
+
+#: 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 "De naam is reeds in gebruik."
+
+#: 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 "Geen unieke naam"
 
 #: 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."
+"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 ""
 "Minstens een van de objecten op het klembord kon niet geplakt worden: een "
 "object met dezelfde naam bestaat reeds.  Alle andere objecten zijn geplakt."
@@ -276,18 +236,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Het bestand %1 kan niet worden geopend. Controleer of de map bestaat en dat u "
-"schrijftoegang hebt tot de map."
+"Het bestand %1 kan niet worden geopend. Controleer of de map bestaat en dat "
+"u schrijftoegang hebt tot de map."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Het bestand kan niet worden geopend"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Deze map kan niet worden aangemaakt:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Deze map kan niet worden aangemaakt:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -301,1365 +259,1526 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "De map kan niet worden aangemaakt"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Toestandsnaam invoeren"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Algemene instellingen"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Geef de naam van de nieuwe toestand:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Pakket als namespace"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Activiteit invoeren"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuele destructors"
 
-#: 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 "Geef de naam van de nieuwe activiteit:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Lege constructors genereren"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nieuwe activiteit"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Accessormethodes genereren"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-model"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operaties zijn inline"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logische weergave"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Toegangsfuncties zijn inline"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Use Case-weergave"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Toegangsfuncties zijn openbaar"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Componentweergave"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Bestand wordt geïmporteerd: %1 Voortgang: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Inzetweergave"
+#: 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 "Gereed."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Entiteitrelatiemodel"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Is de scope %1 een namespace of een klasse?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Gegevenstypes"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++-import vereist uw hulp"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Het huidige bestand is gewijzigd.\n"
-"Wilt u het opslaan?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Namespace"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Het bestand %1 bestaat niet."
+#: 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 "Klasse"
 
-#: 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 "Laadfout"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Interne fout"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Het bestand %1 schijnt corrupt te zijn."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntaxisfout voor %1"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Geen XMI-bestand gevonden in het gecomprimeerde bestand %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Ontleedfout voor %1"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr ""
-"Er deed zich een fout voor tijdens het laden van het uitgepakte bestand: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Er deed zich een fout voor tijdens het laden van bestand: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "expressie verwacht"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Er deed zich een fout voor tijdens het uploaden van bestand: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Declaratiesyntaxisfout"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "use case-diagram"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} verwacht"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klassendiagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "namespace verwacht"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sequentiediagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ verwacht"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "collaboratiediagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Namespace naam verwacht"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "toestandsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Typespeficier voor declaratie nodig"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "activiteitendiagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "verwachtte een declaratie"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "componentdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Constante-expressie verwacht"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "inzetdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' verwacht"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "Entiteitrelatiediagram"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} ontbreekt"
 
-#: 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 "Naam"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Member-initialisatie verwacht"
 
-#: 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 "Naam invoeren:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Basisklasse klassificeerder verwacht"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Dat is een ongeldige naam voor een diagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Initialisatieclausule verwacht"
 
-#: 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 "Ongeldige naam"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identifier verwacht"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Er is al een andere diagram die deze naam gebruikt."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Type ID verwacht"
 
-#: 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 "Geen unieke naam"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Klassenaam verwacht"
 
-#: 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 "Dat is een ongeldige naam."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "conditie verwacht"
 
-#: 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 "De naam is reeds in gebruik."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "statement verwacht"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"De naam die u gegeven hebt is niet uniek.\n"
-"Wilt u dat?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "for initialisatie verwacht"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Naam is niet uniek"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "catch verwacht"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Naam gebruiken"
+#: 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 "Eigenscha&ppen"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Nieuwe naam invoeren"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Beginactiviteit"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Wilt u werkelijk diagram %1 verwijderen?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Eindactiviteit"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Diagram verwijderen"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Vertakken/samenvoegen"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Document aan het instellen..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Afsplitsten/verenigen"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Herleiden objectreferenties..."
+#: 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 "Algemeen"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Bezig UML-elementen te laden..."
+#: 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 "Algemene eigenschappen"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Bezig diagrammen te laden..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Activiteittype:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Activiteitnaam:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/auto-opslag%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 "Documentatie"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Map extern maken"
+#: 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 "Lettertype:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Modelnaam invoeren"
+#: 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 "Lettertype-instellingen"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Geef de nieuwe naam van het model:"
+#: 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 "Kleur"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Weergaven"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Diagramobjectkleuren"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"De naam die u opgegeven hebt is ongeldig!\n"
-"Het aanmaakproces is geannuleerd."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Activiteiten"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ongeldige naam"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nieuwe activiteit..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"De naam die u opgegeven hebt is niet uniek.\n"
-"Het aanmaken is geannuleerd."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Anker verwijderen"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Aanmaken onderbroken"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Hernoemen"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Lijstweergave laden..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nieuwe activiteit"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Maak eerst de map leeg voordat u deze verwijderd."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nieuwe activiteit"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Map is niet leeg"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Activiteit hernoemen"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Een operatie met deze signatuur bestaat reeds. U kunt hem niet nogmaals "
-"toevoegen."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Geef de naam van de nieuwe activiteit:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Activiteitennaam invoeren"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Naam:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nieuwe_toestand"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Type:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisatie"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associaties"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Zelfassociatie"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Associatie-eigenschappen"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Collaboratieboodschap"
+#: 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 "Algemene instellingen"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sequentieboodschap"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Rollen"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Collaboratieboodschap aan zichzelf"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rolinstellingen"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sequentieboodscap aan zichzelf"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Lettertype voor associatie"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisatie"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Eigenschappen van rol A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Algemene associatie"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Eigenschappen van rol B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exporteren"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Zichtbaarheid van rol A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Zichtbaarheid van rol B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nieuw"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Veranderbaarheid van rol A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "T&onen"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Veranderbaarheid van rol B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Code"
+msgid "Rolename:"
+msgstr "Rolnaam:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Actieve taa&l"
+msgid "Multiplicity:"
+msgstr "Multipliciteit:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentatie"
+msgid "Public"
+msgstr "Public"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Slash-slash (//)"
+msgid "Private"
+msgstr "Private"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Slash-ster (/**  */)"
+msgid "Protected"
+msgstr "Protected"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stijl:"
+msgid "Implementation"
+msgstr "Implementatie"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ codegeneratie</p>"
+msgid "Changeable"
+msgstr "Veranderbaar"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Algemeen"
+msgid "Frozen"
+msgstr "Bevroren"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Methodebody-generatie"
+msgid "Add only"
+msgstr "Alleen-toevoegen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Het volgende gebruiken voor klassen in de gegenereerde code:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Klasse&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Naam actor:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Pakket&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variabele</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Naam Use Case:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Interface&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Component&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artefact&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Tekenreeks</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Naam van enumeratie:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lijst</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Gegevenstype&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Entiteit&naam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globaal?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotypenaam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Pakketnaam:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klassenaam"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&bstracte klasse"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Include-bestand</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstracte gebruikstoestand"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projectgeneratie"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "Uitvo&erbaar"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "ANT-bouwdocument aanmaken"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Tekenen als"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Autogeneratiemethoden"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Stan&daard"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Lege-constructor-methoden"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Vulkleur:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Associatietoegangsmethoden"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&liotheek"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Attribuuttoegangsmethoden"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabel"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Zichtbaarheid"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Private"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublic"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivate"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Uit hoofdobject"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Standaard-scope van attribuuttoegangsmethode:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentatie"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Standaard-associatieveld-scope:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klassenaam:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Uit rol van hogerliggend object"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instantienaam:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java codegeneratie</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Tekenen als actor"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hekje (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Meerdere instanties"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Begin-Einde (=begin  =einde)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Destructie tonen"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby codegeneratie</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Componentnaam:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Knooppuntnaam:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotypenaam:"
+
+#: 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 ""
+"De naam die u gekozen hebt\n"
+"is reeds in gebruik.\n"
+"De naam is teruggezet."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Naam is niet uniek"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attributen"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Ni&euw attribuut..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operaties"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Ni&euwe operatie..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Sjablonen"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Ni&euw sjabloon..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enumeratiecontanten"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Ni&euwe enumeratieconstante..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Entiteitattributen"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Ni&euw entiteitattribuut..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Anker verwijderen"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "Eigenscha&ppen"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Tonen"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "O&peraties"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Zichtbaarheid"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&peratie-signatuur"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&kket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ributen"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&ype"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibuutsignatuur"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Tekenen als cirkel"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Weergave"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Weergaveopties"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attribuutinstellingen"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operatie-instellingen"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Sjablooninstellingen"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Instellingen voor enummeratieconstanten"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Entiteitattribuutinstellingen"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Insluiting"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Inhoudinstellingen"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klasse-associaties"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nieuwe_klasse"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nieuwe Klasse"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klasseattributen"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klasseoperaties"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Instellingen voor Codegeneratie"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Taal"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "Aan&maken"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Mappen"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Gereed"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Alle gegenereerde bestanden naar map schrijven:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Code is aangemaakt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Bla&deren..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Niet aangemaakt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Blade&ren..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Nog niet aangemaakt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "Header-bestanden uit deze map &insluiten:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "De map %1 bestaat nog niet. Wilt u de map nu aanmaken?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Bestanden gegenereerd door de Codegenerator zullen naar deze map geschreven "
-"worden"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "De uitvoermap bestaat niet"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Map aanmaken"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Niet aanmaken"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Bestanden in deze map zullen als header-bestanden voor de gegenereerde code "
-"gebruikten worden"
+"De map kon niet aangemaakt worden.\n"
+"Selecteer een geldige map of controleer uw toegangsrechten tot de "
+"bovenliggende map."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Overschrijfbeleid"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Fout bij het aanmaken van de map"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Selecteer een geldige map."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Als de bestandsnaam die de codegenerator wil gebruiken voor haar\n"
-" uitvoerbestand al bestaat:"
+"De uitvoermap bestaat, maar er kan niet in geschreven worden.\n"
+"Stel de juiste toegangsrechten in of kies een andere map."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "O&verschrijven"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Fout bij het schrijven naar de uitvoermap"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Overschrijf het bestaande bestand in de doelmap indien deze bestaat"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 is waarschijnlijk geen map. Gelieve een geldige map te selecteren."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Vra&gen"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Kies een geldige map"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Als een bestand met dezelfde naam bestaat, vraag om bevestiging"
+msgid "Code Viewer"
+msgstr "Codeweergave"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Andere naam gebr&uiken"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Geen opties beschikbaar.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Als een bestand reeds bestaat in de doelmap, selecteer een andere naam om te "
-"gebruiken door een achtervoegsel toe te voegen aan de bestandsnaam"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrammen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Opmaak"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Regels"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Huidige diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Type regeleinde::"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Alle diagrammen"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Type insprong:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "Diagrammen &selecteren"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Inspringafstand:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "Diagram&type"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selectie"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Use Case"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Collaboratie"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Niet inspringen"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sequentie"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Toestand"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Spatie"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Component"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Omvang broncode-opmerking"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Inzet"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Geen diagrammen geselecteerd."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Het formaat waar de afbeeldingen naar geëxporteerd worden"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Notitiedocumentatie"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Doelbestand bestaat reeds"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Opmerkingen schrijven &voor secties zelfs als deze \n"
-"leeg zijn"
+"Het bestand %1 bestaat reeds in %2\n"
+"\n"
+"Umbrello kan het bestand overschrijven, een gelijkwaardige bestandsnaam "
+"aanmaken\n"
+"of het bestand niet aanmaken."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "Toep&assen op alle overgebleven bestanden"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Overschrijven"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "Ver&gelijkbare bestandsnaam aanmaken"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Bestan&d niet aanmaken"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parametereigenschappen"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Type:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Naam:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Beg&inwaarde:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Passeerrichting"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Schrijft opmerkingen om de verschillende secties (public, private, etc.) in een "
-"klasse aan te duiden, zelfs als de secties leeg zijn"
+"\"in\" is een alleen lezen parameter, \"out\" is een alleen schrijven "
+"parameter en \"inout\" is een parameter voor het lezen en schrijven."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Documentatie-opmerkingen schrij&ven zelfs als deze leeg zijn"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Inbegrepen items"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Opmerkingen schrijven voor klasse- en met&hodendocumentatie zelfs als deze leeg "
-"zijn"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Operatie selecteren"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Taalopties"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sequentienummer:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Codegeneratieassistent"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klasse-operatie:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Klassen selecteren"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Aangepaste operatie:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Umbrello-instellingen"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Gebruikersinterface"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Instellingen voor de gebruikersinterface"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Lijnkleur:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Standaardkl&eur"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Vulkleur:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Standaard&kleur"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Lijnbreedte:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "St&andaardbreedte"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "Vulkleur gebr&uiken"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Alle klassen waarvan u code voor wilt genereren\n"
-"in de lijst rechts plaatsen"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Klasse toevoegen voor codegeneratie"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Ongedaan maken activeren"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Geselecteerde klassen"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Getabte diagrammen gebruiken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Klasse uit Codegeneratie verwijderen"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Nieuwe C++/Java-generatoren gebruiken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Beschikbare klassen"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Hoekige associatielijnen gebruiken"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Codegeneratiestatus"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatisch opslaan"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Druk op de Generatie-knop om de codegeneratie te starten"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Automatisch opslaan activere&n"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Generatiestatus"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Interval voor automatisch opslaan (in minuten):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Codeweergave"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Autosave suffix instellen"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Verborgen blokken tonen"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt> <p>Het automatisch opgeslagen bestand zal in ~/autosave.xmi bewaard "
+"worden wanneer u het bestand nog niet handmatig hebt opgeslagen.</p> "
+"<p>Wanneer u het handmatig opgeslagen hebt zal de automatische opslag "
+"plaatsvinden in de map van het oorspronkelijke bestand. De bestandsnaam is "
+"hetzelfde als de oorspronkelijke naam, gevolgd door het opgegeven "
+"achtervoegsel.</p> <p>Wanneer het achtervoegsel gelijk is aan het "
+"achtervoegsel van het bestand dat u hebt opgeslagen, zal de automatische "
+"opslag uw bestand automatisch overschrijven.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">plaats hier de componentnaam</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Start"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Bloktype tonen"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Sta&rtlogo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Kleuren"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Tip van de dag"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Lettertype:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Laatste project &laden"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papier:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Nieuw project starten met:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Geselecteerd:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Geen diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML-objectblock:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klassendiagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Verborgen blok:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Use Case-diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Onbewerkbare tekst:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sequentiediagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Bewerkbare tekst:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Collaboratiediagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagrameigenschappen"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Toestandsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Naam:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Activiteitendiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zoomen:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Componentdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Inzetdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klasse-instellingen"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "&Zichtbaarheid tonen"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Attributen tonen"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Operaties tonen"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Stereot&ype tonen"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Attribuutsignatuur tonen"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Pakket tonen"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Operatiesignatuur tonen"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "R&aster tonen"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Startscope"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Magne&tisch raster"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Standaard-scope van attribuut:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Magnetische componentgrootte"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Standaard-operatie-scope:"
 
-#. 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."
-msgstr ""
-"Stel de grootte van de componenten zo in dat ze een meervoud zijn van de "
-"rastergrootte. Als \"Magnetisch raster\" is ingeschakeld zal een component "
-"altijd met alle 4 zijden worden uitgelijnd met het raster."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Codegeneratie"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Rastergrootte:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Instellingen voor de codegeneratie"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Instellingen voor de codeweergave"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Begintoestand"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Lijnbreedte:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Eindtoestand"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Alle weegaven exporteren"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Toestandstype:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "Map om het &diagram in op te slaan:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Toestandsnaam:"
 
-#. 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"
-msgstr "De basismap waarin alle afbeeldingen opgeslagen worden"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Diagramobjectkleur"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Afbeeld&ingstype:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attribuuteigenschappen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Het formaat waar de afbeeldingen naar geëxporteerd worden"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Zichtbaarheid cla&ssificeerder (\"statisch\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Mappen ge&bruiken"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"In de doelmap dezelfde boomstructuur als in het document aanmaken\n"
-"om de weergaven op te slaan"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&ected"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementatie"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "U hebt een ongeldige attribuutnaam opgegeven."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Attribuutnaam is ongeldig"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"De weergaven worden opgeslagen in mappen in het document. Met deze optie wordt "
-"dezelfde boomstructuur, die wordt gebruikt in het document, aangemaakt in de "
-"geselecteerde basismap.\n"
-"Alleen mappen van de gebruiker zullen aangemaakt worden in de basismap "
-"(Logische weergave, use case en dergelijke worden niet aangemaakt)."
+"De attribuutnaam die u gekozen hebt is reeds in gebruik door deze operatie."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Roleigenschappen"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attribuutnaam is niet uniek"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rolnaam:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Entiteitattribuuteigenschappen"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multipliciteit:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Stan&daardwaarde:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Aanpasbaarheid van rol"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Lengte/waarden:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Alleen-toevoegen"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automatisch ophogen"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Bevroren"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "&null toestaan"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Veranderbaar"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attributen:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Zichtbaarheid van rol"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexeren"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementatie"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "Gee&n"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Welkom bij Umbrello."
-"<p>\n"
-"<p>UML-diagrammen maken het mogelijk uw object-geörienteerde software te "
-"ontwerpen. <a href=\"help:/umbrello\">Het handboek van Umbrello</a> "
-"geeft een goede introductie voor het gebruik van UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primair"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Welkom bij Umbrello 1.5. In deze versie zijn de associatieklassen nieuw, net "
-"als de Ruby code-generatie, het extern maken van mappen, de mogelijkheid om de "
-"interfave te veranderen in klassen en meer.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Getabte diagrammen en extern gemaakte mappen zijn exclusief. Indien u "
-"externe mappen nodig heeft, deactiveer dan de &quot;Gebruik getabte "
-"diagrammen&quot; in de algemene instellingen.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Uniek"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p> Van de meeste diagrammen kunt u de grootte niet wijzigen. Ze passen zelf "
-"hun grootte aan aan de inhoud.\n"
-"Boxen, notities en sequentiediagramberichten kunnen van grootte worden "
-"veranderd door er op te klikken en het rode vierkantje te verslepen.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "U hebt een ongeldige entiteitattribuutnaam opgegeven."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Als u een reeds bestaande klasse wilt toevoegen aan een diagram, sleep deze "
-"vanuit de boomstructuur naar het diagram.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Entiteitattribuutnaam is ongeldig"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p> Umbrello is een nieuwe refactioneringsagent waarmee u operaties tussen een "
-"klasse en zijn afgeleide en basis kunt verplaatsen.\n"
-"\n"
-"Klik met de rechtermuisknop op een klasse om de refactioneringsagent te "
-"openen.</p>\n"
+"De entiteitattribuutnaam die u gekozen hebt is reeds in gebruik door deze "
+"operatie."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Objecten in een sequentiediagram kunnen een destructorbox bevatten\n"
-"en als actors getekend worden.  Dubbelklikken zal het eigenschappenvenster "
-"tonen.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Entiteitattribuutnaam is niet uniek"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sequentiediagramberichten kunnen dienen als constructors. Klik op de "
-"objectbox (in plaats van de verticale lijn) om het een constructor te maken."
-"<p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operatie-eigenschappen"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sequentiediagrammen ondersteunen berichten aan zichzelf. Klik nogmaals op de "
-"verticale lijn om een automessage te maken."
-"<p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstracte operatie"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Omdien bij het laden van een extern bestand niets getoond wordt in de "
-"lijstweergave, probeer dan het model op te slaan onder een andere naam.\n"
-"Sluit het bestand vervolgens en laad het opgeslagen bestand opnieuw. "
-"Normaalgesproken zou de lijstweergave dan gevuld moeten worden.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Query (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Knippen en kopiëren zal de afbeelding ook als PNG-afbeelding naar het "
-"klembord exporteren, zodat dit makkelijk ingevoegd kan worden in KWord of "
-"andere toepassingen.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parameters"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Associaties hoeven niet getoond te worden met behulp van rechte lijnen,\n"
-"door te dubbelklikken op een lijn maakt men er een verplaatsbaar punt bij.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Nieu&we parameter..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Men kan \"automatisch opslaan\" aanzetten in het instellingenvenster.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "U hebt een ongeldige parameternaam opgegeven."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Ontbreekt er een functie in Umbrello die u nodig hebt? Laat het ons dan "
-"weten. Voeg uw wens toe aan de bugs-database door middel van menuoptie \"Help->"
-"Bug rapporteren\", of zend uw wens (in het Engels) naar de discussiegroep "
-"uml-devel.</p>\n"
-"<ul>\n"
-"<li>\n"
-"<a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Parameternaam ongeldig"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Alle geselecteerde objecten kunnen verwijderd worden door de toets Del of "
-"Backspace in te drukken.</p>\n"
+"De parameternaam die u gekozen hebt\n"
+"is reeds in gebruik in deze operatie."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Als u een fout in Umbrello gevonden hebt, laat het ons dan zo snel mogelijk "
-"weten.\n"
-"U kunt programmafouten als bugrapport indienen via menuoptie \"Help->"
-"Bug rapporteren\".</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameternaam is niet uniek"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Door te drukken op de Escape-toets zet u het huidige hulpmiddel op het "
-"geselecteerde hulpmiddel. Met de toets Backspace gaat u terug naar het vorige "
-"gebruikte hulpmiddel.</p>\n"
+"De parameternaam die u gekozen hebt is reeds in gebruik in deze operatie."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "U hebt een ongeldige parameternaam opgegeven."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Operatienaam ongeldig"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Een operatie met deze signatuur bestaat reeds in %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Kies een andere naam of parameterlijst."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Roleigenschappen"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Sjablooneigenschappen"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "U hebt een ongeldige sjabloonnaam opgegeven."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Sjabloonnaam is ongeldig"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Alle objecten kunnen geselecteerd worden door \"Ctrl-A\" in te drukken.</p>\n"
+"De sjabloonparameternaam die u gekozen hebt is reeds in gebruik in deze "
+"operatie."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Sjabloonnaam is niet uniek"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Klasseopties tonen"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagramkleuren"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "De naam die u opgegeven hebt is ongeldig."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "De naam die u opgegeven hebt is niet uniek."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Naam is niet uniek"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Regel:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Vulkleur:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "St&andaard"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "Element v&ullen"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Alle weergaven exporteren..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Er deden zich fouten voor bij het exporteren van de afbeeldingen:"
+
+#: 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 "Er deed zich een fout voor tijdens het opslaan van bestand: %1"
 
-#: tips.txt:108
+#: 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 "Opslagfout"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Autonome codegenerator voor Umbrello UML-modelleerder"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Om te zetten bestand"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Te gebruiken XSLT-bestand"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Een nieuwe klasse kan aangemaakt en geïnitialiseerd worden door de \"Nieuwe "
-"Klasse-assistent\" uit het Code-menu te gebruiken.</p>\n"
+"(c) 2006 Gael de Chalendar (Kleag), (c) 2002-2006 Auteurs van Umbrello UML-"
+"modelleerder"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "De auteurs van Umbrello UML Modeller"
+
+#: 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 "Naam"
+
+#: 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 "Naam invoeren:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Operatienaam invoeren:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Nieuwe tekst invoeren:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "FOUT"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Tekst wijzigen"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Het mapbestand %1 bestaat niet."
+
+#: 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 "Laadfout"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Het mapbestand %1 kan niet geopend worden."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1713,6 +1832,10 @@ msgstr "Nieuwe operatie..."
 msgid "Select Operation..."
 msgstr "Operatie selecteren..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Tekst wijzigen..."
@@ -1764,6 +1887,19 @@ msgstr "Nieuw"
 msgid "Rename..."
 msgstr "Hernoemen..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Fout bij plakken"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Lijnkleur..."
@@ -1792,14 +1928,26 @@ msgstr "Map intern maken"
 msgid "Import Classes..."
 msgstr "Klassen importeren..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pakket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Subsysteem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefact"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Componentdiagram..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Knooppunt"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Inzetdiagram..."
@@ -1808,10 +1956,18 @@ msgstr "Inzetdiagram..."
 msgid "Folder"
 msgstr "Map"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entiteit"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Entiteitrelatiediagram..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Actor"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Use Case-diagram..."
@@ -1848,6 +2004,18 @@ msgstr "Nieuw entiteitattribuut..."
 msgid "Export as Picture..."
 msgstr "Exporteren als afbeelding..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interface"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Gegevenstype"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumeratie"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klassendiagram..."
@@ -1868,26 +2036,10 @@ msgstr "Sequentiediagram..."
 msgid "Collaboration Diagram..."
 msgstr "Collaboratiediagram..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attributen"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operaties"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Uitsluitend public"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Zichtbaarheid"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operatie-signatuur"
@@ -1900,11 +2052,6 @@ msgstr "Attribuutsignatuur"
 msgid "Stereotype"
 msgstr "Stereotype"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Tonen"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribuut..."
@@ -1929,14 +2076,6 @@ msgstr "Vulkleur..."
 msgid "Use Fill Color"
 msgstr "Vulkleur gebruiken"
 
-#: 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 "Kleur"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Actor..."
@@ -1965,10 +2104,26 @@ msgstr "Enumeratie..."
 msgid "Package..."
 msgstr "Pakket..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Begintoestand"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Eindtoestand"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Toestand..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Beginactiviteit"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Eindactiviteit"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Subsysteem..."
@@ -2013,6 +2168,14 @@ msgstr "Anker verwijderen"
 msgid "Change Association Name..."
 msgstr "Associatienaam wijzigen..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Diagram legen"
@@ -2048,8 +2211,8 @@ msgstr "de map van het bestand"
 
 #: 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 ""
 "boomstructuur om de weergaven van het document op te slaan bewaren in de "
 "doelmap"
@@ -2059,191 +2222,96 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 de auteurs van Umbrello UML Modeller"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Onjuist gebruik van associaties."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Associatiefout"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Het mapbestand %1 bestaat niet."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Het mapbestand %1 kan niet geopend worden."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Kris Luyten,Rinse de Vries,Ruurd Pels"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kris.luyten@luc.ac.be,rinse@kde.nl,ruurd@tiscali.nl"
-
-#: 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 "Gereed."
-
-#: 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 ""
-"Houd Shift of Ctrl ingedrukt om langs de X-as te verplaatsen. Houd Shift en "
-"Control ingedrukt om langs de Y-as te verplaatsen. Klik met de rechtermuisknop "
-"om de verplaatsing te annuleren."
-
-#: 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 ""
-"Houd Shift of Ctrl ingedrukt om langs de X-as te verplaatsen. Houd Shift en "
-"Control ingedrukt om langs de Y-as te verplaatsen. Klik met de rechtermuisknop "
-"om de verandering van grootte te annuleren."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Is de scope %1 een namespace of een klasse?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++-import vereist uw hulp"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Namespace"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Bestand wordt geïmporteerd: %1 Voortgang: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Interne fout"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntaxisfout voor %1"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Ontleedfout voor %1"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nieuwe_actor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "expressie verwacht"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nieuwe_usecase"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Declaratiesyntaxisfout"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nieuw_pakket"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} verwacht"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nieuw_component"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "namespace verwacht"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nieuw_knooppunt"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ verwacht"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nieuwe_artefact"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Namespace naam verwacht"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nieuwe_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Typespeficier voor declaratie nodig"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nieuw_gegevenstype"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "verwachtte een declaratie"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nieuwe_enumeratie"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Constante-expressie verwacht"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nieuwe_entiteit"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' verwacht"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nieuwe_map"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} ontbreekt"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nieuwe_associatie"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Member-initialisatie verwacht"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nieuw_object"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Basisklasse klassificeerder verwacht"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Initialisatieclausule verwacht"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Leeg"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identifier verwacht"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Niet goed geformuleerd argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Type ID verwacht"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Onbekend argumenttype"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Klassenaam verwacht"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Ongeldige methodenaam"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "conditie verwacht"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Ongeldig returntype"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "statement verwacht"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Onbekende fout"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "for initialisatie verwacht"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Dit is een gereserveerd trefwoord in de taal van de geconfigureerde "
+"codegenerator."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "catch verwacht"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Gereserveerd trefwoord"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2257,107 +2325,66 @@ msgstr "Objectnaam invoeren:"
 msgid "new_parameter"
 msgstr "nieuwe_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Algemene instellingen"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Pakket als namespace"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuele destructors"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Lege constructors genereren"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Accessormethodes genereren"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operaties zijn inline"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Toegangsfuncties zijn inline"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Toegangsfuncties zijn openbaar"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 pagina %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Diagramnaam invoeren"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Basisklasse toevoegen"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Geef de naam van het nieuwe diagram:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Afgeleide klasse toevoegen"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"U gaat het hele diagram verwijderen.\n"
-"Wilt u dit werkelijk?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Operatie toevoegen"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Diagram verwijderen?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Attribuut toevoegen"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Hernoemen onderbroken"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Basisinterface toevoegen"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Het hernoemen van een onderdeel van de lijstweergave %1 is nog niet "
-"geïmplementeerd."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Afgeleide interface toevoegen"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Functie nog niet geïmplementeerd"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Basisklassificeerder"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"De naam die u opgegeven hebt was ongeldig.\n"
-"Het hernoemen is geannuleerd."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Afgeleide klassificeerders"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nieuwe_associatie"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Toestandsnaam invoeren"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nieuw_attribuut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Geef de naam van de nieuwe toestand:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nieuw_sjabloon"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Activiteit invoeren"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nieuwe_operatie"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Onjuist gebruik van associaties."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nieuwe_constante"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Associatiefout"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nieuw_veld"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nieuwe_toestand"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2511,11 +2538,6 @@ msgstr "&Exporteren als afbeelding..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "&Alle diagrammen als afbeeldingen exporteren..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "Eigenscha&ppen"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Zoomschuifregelaar"
@@ -2600,14 +2622,21 @@ msgstr "&Documentatie"
 msgid "Opening file..."
 msgstr "Bezig met het openen van het bestand..."
 
+#: 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 "Bezig met het aanmaken van een nieuw document..."
 
 #: 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"
@@ -2644,6 +2673,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-gecomprimeerd XMI-bestand\n"
 "*|Alle bestanden"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2652,6 +2685,10 @@ msgstr ""
 "Het bestand %1 bestaat reeds.\n"
 "Wilt u het overschrijven?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Overschrijven"
@@ -2687,8 +2724,8 @@ msgstr "Bezig met het invoegen van de inhoud van het klembord..."
 
 #: 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 ""
 "Umbrello kan de inhoud van het klembord niet plakken. De objecten op het "
 "klembord zijn mogelijk niet van het juiste type om hier geplakt te kunnen "
@@ -2746,1268 +2783,1329 @@ msgstr "Alle bestanden"
 msgid "Select Code to Import"
 msgstr "Bron selecteren om te importeren"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Klasse&naam:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Naam actor:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nieuw_attribuut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Pakket&naam:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nieuw_sjabloon"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Naam Use Case:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nieuwe_operatie"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Interface&naam:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nieuwe_constante"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Component&naam:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nieuw_veld"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artefact&naam:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-model"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Naam van enumeratie:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logische weergave"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Gegevenstype&naam:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Use Case-weergave"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Entiteit&naam:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Componentweergave"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotypenaam:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Inzetweergave"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Pakketnaam:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Entiteitrelatiemodel"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&bstracte klasse"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Gegevenstypes"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstracte gebruikstoestand"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Het huidige bestand is gewijzigd.\n"
+"Wilt u het opslaan?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "Uitvo&erbaar"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Het bestand %1 bestaat niet."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Tekenen als"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Het bestand %1 schijnt corrupt te zijn."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Stan&daard"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Geen XMI-bestand gevonden in het gecomprimeerde bestand %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&liotheek"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr ""
+"Er deed zich een fout voor tijdens het laden van het uitgepakte bestand: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabel"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Er deed zich een fout voor tijdens het laden van bestand: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublic"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Er deed zich een fout voor tijdens het uploaden van bestand: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivate"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "use case-diagram"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klassendiagram"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentatie"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sequentiediagram"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klassenaam:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "collaboratiediagram"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instantienaam:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "toestandsdiagram"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Tekenen als actor"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "activiteitendiagram"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Meerdere instanties"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "componentdiagram"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Destructie tonen"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "inzetdiagram"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Componentnaam:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "Entiteitrelatiediagram"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Knooppuntnaam:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Dat is een ongeldige naam voor een diagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotypenaam:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Er is al een andere diagram die deze naam gebruikt."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"De naam die u gekozen hebt\n"
-"is reeds in gebruik.\n"
-"De naam is teruggezet."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Naam is niet uniek"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Regel:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Vulkleur:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "St&andaard"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "Element v&ullen"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Activiteiten"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nieuwe activiteit..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Hernoemen"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nieuwe activiteit"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Activiteit hernoemen"
+"De naam die u gegeven hebt is niet uniek.\n"
+"Wilt u dat?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Geef de naam van de nieuwe activiteit:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Naam gebruiken"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Associatie-eigenschappen"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Nieuwe naam invoeren"
 
-#: 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 "Algemene instellingen"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Wilt u werkelijk diagram %1 verwijderen?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Rollen"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Diagram verwijderen"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rolinstellingen"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Document aan het instellen..."
 
-#: 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 "Lettertype-instellingen"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Herleiden objectreferenties..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Lettertype voor associatie"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Bezig UML-elementen te laden..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Sjablooneigenschappen"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Bezig diagrammen te laden..."
 
-#: 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 "Algemene eigenschappen"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/auto-opslag%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Type:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Map extern maken"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Naam:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Modelnaam invoeren"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "U hebt een ongeldige sjabloonnaam opgegeven."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Geef de nieuwe naam van het model:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Sjabloonnaam is ongeldig"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Weergaven"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"De sjabloonparameternaam die u gekozen hebt is reeds in gebruik in deze "
-"operatie."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Sjabloonnaam is niet uniek"
+"De naam die u opgegeven hebt is ongeldig!\n"
+"Het aanmaakproces is geannuleerd."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Entiteitattribuuteigenschappen"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ongeldige naam"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Stan&daardwaarde:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"De naam die u opgegeven hebt is niet uniek.\n"
+"Het aanmaken is geannuleerd."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Lengte/waarden:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Aanmaken onderbroken"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automatisch ophogen"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Lijstweergave laden..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "&null toestaan"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Maak eerst de map leeg voordat u deze verwijderd."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attributen:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Map is niet leeg"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexeren"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Hernoemen onderbroken"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "Gee&n"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Het hernoemen van een onderdeel van de lijstweergave %1 is nog niet "
+"geïmplementeerd."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primair"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Functie nog niet geïmplementeerd"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"De naam die u opgegeven hebt was ongeldig.\n"
+"Het hernoemen is geannuleerd."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Uniek"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 pagina %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "U hebt een ongeldige entiteitattribuutnaam opgegeven."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Diagramnaam invoeren"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Entiteitattribuutnaam is ongeldig"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Geef de naam van het nieuwe diagram:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"De entiteitattribuutnaam die u gekozen hebt is reeds in gebruik door deze "
-"operatie."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Entiteitattribuutnaam is niet uniek"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Weergave"
+"U gaat het hele diagram verwijderen.\n"
+"Wilt u dit werkelijk?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Klasseopties tonen"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Diagram verwijderen?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagramkleuren"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Weergave wordt geëxporteerd..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "De naam die u opgegeven hebt is ongeldig."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Er deed zich een fout voor bij het exporteren van de afbeelding:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "De naam die u opgegeven hebt is niet uniek."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Het bestand %1 bestaat reeds.\n"
+"Wilt u het overschrijven?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Type:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Bestand bestaat reeds"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello-instellingen"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "De map %1 kon niet worden aangemaakt"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Gebruikersinterface"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Er kan geen leeg diagram worden opgeslagen"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Instellingen voor de gebruikersinterface"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Er deed zich een fout voor bij het opslaan van het diagram in %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Lijnkleur:"
+#: 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 ""
+"Houd Shift of Ctrl ingedrukt om langs de X-as te verplaatsen. Houd Shift en "
+"Control ingedrukt om langs de Y-as te verplaatsen. Klik met de "
+"rechtermuisknop om de verplaatsing te annuleren."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Standaardkl&eur"
+#: 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 ""
+"Houd Shift of Ctrl ingedrukt om langs de X-as te verplaatsen. Houd Shift en "
+"Control ingedrukt om langs de Y-as te verplaatsen. Klik met de "
+"rechtermuisknop om de verandering van grootte te annuleren."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Vulkleur:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Object"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Standaard&kleur"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synchroon bericht"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Lijnbreedte:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynchroon bericht"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "St&andaardbreedte"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Label"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "Vulkleur gebr&uiken"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Notitie"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Ongedaan maken activeren"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Box"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Getabte diagrammen gebruiken"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relatie"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Nieuwe C++/Java-generatoren gebruiken"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Directionele associatie"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Hoekige associatielijnen gebruiken"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementeert (generalisatie/realisatie)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatisch opslaan"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Gedetailleerde geschiedenis"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Automatisch opslaan activere&n"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Oppervlakkige geschiedenis"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Interval voor automatisch opslaan (in minuten):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Verenigen"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Autosave suffix instellen"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Afsplitsen"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt> "
-"<p>Het automatisch opgeslagen bestand zal in ~/autosave.xmi bewaard worden "
-"wanneer u het bestand nog niet handmatig hebt opgeslagen.</p> "
-"<p>Wanneer u het handmatig opgeslagen hebt zal de automatische opslag "
-"plaatsvinden in de map van het oorspronkelijke bestand. De bestandsnaam is "
-"hetzelfde als de oorspronkelijke naam, gevolgd door het opgegeven "
-"achtervoegsel.</p> "
-"<p>Wanneer het achtervoegsel gelijk is aan het achtervoegsel van het bestand "
-"dat u hebt opgeslagen, zal de automatische opslag uw bestand automatisch "
-"overschrijven.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Knooppunt"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Start"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Keuze"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Sta&rtlogo"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Activiteitsovergang"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Tip van de dag"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Bericht"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Laatste project &laden"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "ONGEDEFINIEERD"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Nieuw project starten met:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Selecteren"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Geen diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Klassendiagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Use Case-diagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sequentiediagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Collaboratiediagram"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Operaties tonen"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Toestandsdiagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Activiteitendiagram"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Diagram legen"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Componentdiagram"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Inzetdiagram"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalisatie"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klasse-instellingen"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "&Zichtbaarheid tonen"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Attributen tonen"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Associatienaam invoeren"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Operaties tonen"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Stereot&ype tonen"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Attribuutsignatuur tonen"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Pakket tonen"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Stan&daard"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Startscope"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Standaard-scope van attribuut:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-slash (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Standaard-operatie-scope:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-ster (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Codegeneratie"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stijl:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Instellingen voor de codegeneratie"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ codegeneratie</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Instellingen voor de codeweergave"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Methodebody-generatie"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operatie-eigenschappen"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Het volgende gebruiken voor klassen in de gegenereerde code:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstracte operatie"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Zichtbaarheid cla&ssificeerder (\"statisch\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Query (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variabele</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementatie"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parameters"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Nieu&we parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Tekenreeks</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "U hebt een ongeldige parameternaam opgegeven."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lijst</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Parameternaam ongeldig"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"De parameternaam die u gekozen hebt\n"
-"is reeds in gebruik in deze operatie."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globaal?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameternaam is niet uniek"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"De parameternaam die u gekozen hebt is reeds in gebruik in deze operatie."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klassenaam"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "U hebt een ongeldige parameternaam opgegeven."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Include-bestand</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Operatienaam ongeldig"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projectgeneratie"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Een operatie met deze signatuur bestaat reeds in %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "ANT-bouwdocument aanmaken"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Kies een andere naam of parameterlijst."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Autogeneratiemethoden"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Eigenschappen van rol A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Lege-constructor-methoden"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Eigenschappen van rol B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Associatietoegangsmethoden"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Zichtbaarheid van rol A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Attribuuttoegangsmethoden"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Zichtbaarheid van rol B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Uit hoofdobject"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Veranderbaarheid van rol A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Standaard-scope van attribuuttoegangsmethode:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Veranderbaarheid van rol B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Standaard-associatieveld-scope:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Inbegrepen items"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Uit rol van hogerliggend object"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Notitiedocumentatie"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java codegeneratie</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Ni&euw attribuut..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hekje (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Ni&euwe operatie..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Begin-Einde (=begin  =einde)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Sjablonen"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby codegeneratie</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Ni&euw sjabloon..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Taal"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enumeratiecontanten"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Mappen"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Ni&euwe enumeratieconstante..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Alle gegenereerde bestanden naar map schrijven:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Entiteitattributen"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Bla&deren..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Ni&euw entiteitattribuut..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Blade&ren..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Beginactiviteit"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "Header-bestanden uit deze map &insluiten:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Eindactiviteit"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Bestanden gegenereerd door de Codegenerator zullen naar deze map geschreven "
+"worden"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Activiteittype:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Bestanden in deze map zullen als header-bestanden voor de gegenereerde code "
+"gebruikten worden"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Activiteitnaam:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Overschrijfbeleid"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Diagramobjectkleuren"
+#: 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 ""
+"Als de bestandsnaam die de codegenerator wil gebruiken voor haar\n"
+" uitvoerbestand al bestaat:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attribuuteigenschappen"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "O&verschrijven"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Beg&inwaarde:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Overschrijf het bestaande bestand in de doelmap indien deze bestaat"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Vra&gen"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "U hebt een ongeldige attribuutnaam opgegeven."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Als een bestand met dezelfde naam bestaat, vraag om bevestiging"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Attribuutnaam is ongeldig"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Andere naam gebr&uiken"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"De attribuutnaam die u gekozen hebt is reeds in gebruik door deze operatie."
+"Als een bestand reeds bestaat in de doelmap, selecteer een andere naam om te "
+"gebruiken door een achtervoegsel toe te voegen aan de bestandsnaam"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attribuutnaam is niet uniek"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Opmaak"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Operatie selecteren"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Regels"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sequentienummer:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Type regeleinde::"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klasse-operatie:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Type insprong:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Aangepaste operatie:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Inspringafstand:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrammen"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Huidige diagram"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Alle diagrammen"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Niet inspringen"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "Diagrammen &selecteren"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "Diagram&type"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Spatie"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selectie"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Omvang broncode-opmerking"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Collaboratie"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Opmerkingen schrijven &voor secties zelfs als deze \n"
+"leeg zijn"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sequentie"
+#: 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 ""
+"Schrijft opmerkingen om de verschillende secties (public, private, etc.) in "
+"een klasse aan te duiden, zelfs als de secties leeg zijn"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Inzet"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Documentatie-opmerkingen schrij&ven zelfs als deze leeg zijn"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Geen diagrammen geselecteerd."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Opmerkingen schrijven voor klasse- en met&hodendocumentatie zelfs als deze "
+"leeg zijn"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Weergaveopties"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Taalopties"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attribuutinstellingen"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Codegeneratieassistent"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operatie-instellingen"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Klassen selecteren"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Sjablooninstellingen"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Alle klassen waarvan u code voor wilt genereren\n"
+"in de lijst rechts plaatsen"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Instellingen voor enummeratieconstanten"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Klasse toevoegen voor codegeneratie"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Entiteitattribuutinstellingen"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Geselecteerde klassen"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Inhoudinstellingen"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Klasse uit Codegeneratie verwijderen"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associaties"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Beschikbare klassen"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klasse-associaties"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Codegeneratiestatus"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "O&peraties"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Druk op de Generatie-knop om de codegeneratie te starten"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Zichtbaarheid"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Generatiestatus"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&peratie-signatuur"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Verborgen blokken tonen"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&kket"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">plaats hier de componentnaam</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ributen"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&ype"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Bloktype tonen"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibuutsignatuur"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Kleuren"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Tekenen als cirkel"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Lettertype:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Begintoestand"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papier:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Eindtoestand"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Geselecteerd:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Toestandstype:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML-objectblock:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Toestandsnaam:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Verborgen blok:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Diagramobjectkleur"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Onbewerkbare tekst:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nieuwe_klasse"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Bewerkbare tekst:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nieuwe Klasse"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagrameigenschappen"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klasseattributen"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zoomen:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klasseoperaties"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parametereigenschappen"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "R&aster tonen"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Passeerrichting"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Magne&tisch raster"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Magnetische componentgrootte"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" is een alleen lezen parameter, \"out\" is een alleen schrijven parameter "
-"en \"inout\" is een parameter voor het lezen en schrijven."
+"Stel de grootte van de componenten zo in dat ze een meervoud zijn van de "
+"rastergrootte. Als \"Magnetisch raster\" is ingeschakeld zal een component "
+"altijd met alle 4 zijden worden uitgelijnd met het raster."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "Aan&maken"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Rastergrootte:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Gereed"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Code is aangemaakt"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Niet aangemaakt"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Lijnbreedte:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Nog niet aangemaakt"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Alle weegaven exporteren"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "De map %1 bestaat nog niet. Wilt u de map nu aanmaken?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "Map om het &diagram in op te slaan:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "De uitvoermap bestaat niet"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "De basismap waarin alle afbeeldingen opgeslagen worden"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Map aanmaken"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Afbeeld&ingstype:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Niet aanmaken"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Mappen ge&bruiken"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"De map kon niet aangemaakt worden.\n"
-"Selecteer een geldige map of controleer uw toegangsrechten tot de bovenliggende "
-"map."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Fout bij het aanmaken van de map"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Selecteer een geldige map."
+"In de doelmap dezelfde boomstructuur als in het document aanmaken\n"
+"om de weergaven op te slaan"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"De uitvoermap bestaat, maar er kan niet in geschreven worden.\n"
-"Stel de juiste toegangsrechten in of kies een andere map."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Fout bij het schrijven naar de uitvoermap"
+"De weergaven worden opgeslagen in mappen in het document. Met deze optie "
+"wordt dezelfde boomstructuur, die wordt gebruikt in het document, aangemaakt "
+"in de geselecteerde basismap.\n"
+"Alleen mappen van de gebruiker zullen aangemaakt worden in de basismap "
+"(Logische weergave, use case en dergelijke worden niet aangemaakt)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 is waarschijnlijk geen map. Gelieve een geldige map te selecteren."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Aanpasbaarheid van rol"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Kies een geldige map"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Zichtbaarheid van rol"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Doelbestand bestaat reeds"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exporteren"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Het bestand %1 bestaat reeds in %2\n"
-"\n"
-"Umbrello kan het bestand overschrijven, een gelijkwaardige bestandsnaam "
-"aanmaken\n"
-"of het bestand niet aanmaken."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "Toep&assen op alle overgebleven bestanden"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Overschrijven"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "Ver&gelijkbare bestandsnaam aanmaken"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Bestan&d niet aanmaken"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Geen opties beschikbaar.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multipliciteit"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Multipliciteit invoeren:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Associatienaam invoeren"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Associatienaam invoeren:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rolnaam"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Rolnaam invoeren:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Operatienaam invoeren:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Nieuwe tekst invoeren:"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "FOUT"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Tekst wijzigen"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Links uitlijnen"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Rechts uitlijnen"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Boven uitlijnen"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nieuw"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Onder uitlijnen"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "T&onen"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Verticaal centreren"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zoomen:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Horizontaal centreren"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Code"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Verticaal verdeeld centreren"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Actieve taa&l"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Horizontaal verdeeld centreren"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Om uit te lijnen dient u tenminste twee objecten zoals klassen of actoren te "
-"selecteren. U kunt geen associaties uitlijnen."
+"<p>Welkom bij Umbrello.<p>\n"
+"<p>UML-diagrammen maken het mogelijk uw object-geörienteerde software te "
+"ontwerpen. <a href=\"help:/umbrello\">Het handboek van Umbrello</a> geeft "
+"een goede introductie voor het gebruik van UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Dit is een gereserveerd trefwoord in de taal van de geconfigureerde "
-"codegenerator."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Gereserveerd trefwoord"
+"<p>Welkom bij Umbrello 1.5. In deze versie zijn de associatieklassen nieuw, "
+"net als de Ruby code-generatie, het extern maken van mappen, de mogelijkheid "
+"om de interfave te veranderen in klassen en meer.</p>\n"
 
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Weergave wordt geëxporteerd..."
-
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Er deed zich een fout voor bij het exporteren van de afbeelding:\n"
+"<p>Getabte diagrammen en extern gemaakte mappen zijn exclusief. Indien u "
+"externe mappen nodig heeft, deactiveer dan de &quot;Gebruik getabte "
+"diagrammen&quot; in de algemene instellingen.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Het bestand %1 bestaat reeds.\n"
-"Wilt u het overschrijven?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Bestand bestaat reeds"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nieuwe_actor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nieuwe_usecase"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nieuw_pakket"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nieuw_component"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nieuw_knooppunt"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nieuwe_artefact"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nieuwe_interface"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nieuw_gegevenstype"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nieuwe_enumeratie"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nieuwe_entiteit"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nieuwe_map"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nieuw_object"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Leeg"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Niet goed geformuleerd argument"
+"<p> Van de meeste diagrammen kunt u de grootte niet wijzigen. Ze passen zelf "
+"hun grootte aan aan de inhoud.\n"
+"Boxen, notities en sequentiediagramberichten kunnen van grootte worden "
+"veranderd door er op te klikken en het rode vierkantje te verslepen.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Onbekend argumenttype"
+#: 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 ""
+"<p>Als u een reeds bestaande klasse wilt toevoegen aan een diagram, sleep "
+"deze vanuit de boomstructuur naar het diagram.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Ongeldige methodenaam"
+#: 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 ""
+"<p> Umbrello is een nieuwe refactioneringsagent waarmee u operaties tussen "
+"een klasse en zijn afgeleide en basis kunt verplaatsen.\n"
+"\n"
+"Klik met de rechtermuisknop op een klasse om de refactioneringsagent te "
+"openen.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Ongeldig returntype"
+#: 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 ""
+"<p>Objecten in een sequentiediagram kunnen een destructorbox bevatten\n"
+"en als actors getekend worden.  Dubbelklikken zal het eigenschappenvenster "
+"tonen.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Onbekende fout"
+#: 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 ""
+"<p>Sequentiediagramberichten kunnen dienen als constructors. Klik op de "
+"objectbox (in plaats van de verticale lijn) om het een constructor te maken."
+"<p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Basisklasse toevoegen"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Sequentiediagrammen ondersteunen berichten aan zichzelf. Klik nogmaals op "
+"de verticale lijn om een automessage te maken.<p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Afgeleide klasse toevoegen"
+#: 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 ""
+"<p>Omdien bij het laden van een extern bestand niets getoond wordt in de "
+"lijstweergave, probeer dan het model op te slaan onder een andere naam.\n"
+"Sluit het bestand vervolgens en laad het opgeslagen bestand opnieuw. "
+"Normaalgesproken zou de lijstweergave dan gevuld moeten worden.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Operatie toevoegen"
+#: 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 ""
+"<p>Knippen en kopiëren zal de afbeelding ook als PNG-afbeelding naar het "
+"klembord exporteren, zodat dit makkelijk ingevoegd kan worden in KWord of "
+"andere toepassingen.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Attribuut toevoegen"
+#: 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 ""
+"<p>Associaties hoeven niet getoond te worden met behulp van rechte lijnen,\n"
+"door te dubbelklikken op een lijn maakt men er een verplaatsbaar punt bij.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Basisinterface toevoegen"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Men kan \"automatisch opslaan\" aanzetten in het instellingenvenster.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Afgeleide interface toevoegen"
+#: 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 ""
+"<p>Ontbreekt er een functie in Umbrello die u nodig hebt? Laat het ons dan "
+"weten. Voeg uw wens toe aan de bugs-database door middel van menuoptie "
+"\"Help->Bug rapporteren\", of zend uw wens (in het Engels) naar de "
+"discussiegroep uml-devel.</p>\n"
+"<ul>\n"
+"<li>\n"
+"<a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>."
+"</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Basisklassificeerder"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Alle geselecteerde objecten kunnen verwijderd worden door de toets Del of "
+"Backspace in te drukken.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Afgeleide klassificeerders"
+#: 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 ""
+"<p>Als u een fout in Umbrello gevonden hebt, laat het ons dan zo snel "
+"mogelijk weten.\n"
+"U kunt programmafouten als bugrapport indienen via menuoptie \"Help->Bug "
+"rapporteren\".</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "De map %1 kon niet worden aangemaakt"
+#: 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 ""
+"<p>Door te drukken op de Escape-toets zet u het huidige hulpmiddel op het "
+"geselecteerde hulpmiddel. Met de toets Backspace gaat u terug naar het "
+"vorige gebruikte hulpmiddel.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Er kan geen leeg diagram worden opgeslagen"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>Alle objecten kunnen geselecteerd worden door \"Ctrl-A\" in te drukken.</"
+"p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Er deed zich een fout voor bij het opslaan van het 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 ""
+"<p>Een nieuwe klasse kan aangemaakt en geïnitialiseerd worden door de "
+"\"Nieuwe Klasse-assistent\" uit het Code-menu te gebruiken.</p>\n"
diff --git a/tde-i18n-pl/messages/tdesdk/umbrello.po b/tde-i18n-pl/messages/tdesdk/umbrello.po
index e4e7716d220..a076b2ae15e 100644
--- a/tde-i18n-pl/messages/tdesdk/umbrello.po
+++ b/tde-i18n-pl/messages/tdesdk/umbrello.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2015-01-17 21:44+0100\n"
 "Last-Translator: mcbx\n"
 "Language-Team:  <pl@li.org>\n"
@@ -20,250 +20,207 @@ msgstr ""
 ">\n"
 ">\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Autonomiczny generator kodu modelera UML Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Plik do przekształcenia"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Plik XSLT, który ma zostać użyty"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 autorzy modelera UML "
-"Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autorzy Umbrello UML Modeller"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Marek Kuziel,Cezary Morga"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Eksportowanie wszystkich widoków..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "fi_corax@op.pl,cezarym@pf.pl"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Jakieś błędy wystąpiły podczas eksportowania obrazków:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Podaj nazwę czynności"
 
-#: 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 "Wystąpiły problemy przy zapisywaniu pliku: %1."
+#: 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 "Podaj nazwę nowej czynności:"
 
-#: 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 "Błąd zapisu"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Wyrównaj do lewej"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Obiekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Wyrównaj do prawej"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Komunikat synchroniczny"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Wyrównaj do góry"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Komunikat asynchroniczny"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Wyrównaj do dołu"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Powiązanie"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
+msgstr "Wyrównaj do środka w pionie"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Zawieranie"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
+msgstr "Wyrównaj do środka w poziomie"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Zakotwiczenie"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
+msgstr "Wyrównaj pionowo z rozprowadzeniem"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etykieta"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
+msgstr "Wyrównaj poziomo z rozprowadzeniem"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Notatka"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Do wyrównywania musisz wybrać co najmniej 2 obiekty takie jak klasy lub "
+"aktorzy. Nie możesz wyrównywać powiązań."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Ramka"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatowanie"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Zależność"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Uogólnienie"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregacja"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Związek"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Powiązanie kierunkowe"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementuje (Uogólnienie/Realizacja)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompozycja"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Przypadek użycia"
-
-#. 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 "Klasa"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Stan początkowy"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Stan końcowy"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Rozgałęzienie/Scalenie"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Rozwidlenie/Połączenie"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pakiet"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponent"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Węzeł"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Zależność"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Powiązanie"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfejs"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Powiązanie z samym sobą"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Typ danych"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Komunikat kooperacji"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Wyliczenie"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Komunikat sekwencji"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Encja"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Komunikat kooperacji wysyłany do siebie"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Pełna historia"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Komunikat sekwencji wysyłany do siebie"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Skrócona historia"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Zawieranie"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Dołącz"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompozycja"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Rozdziel"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizacja"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Połączenie"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Powiązanie jednokierunkowe"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Wybór"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Zakotwiczenie"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Stan przejściowy"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Czynność przejściowa"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Czynność"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stan"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Liczebność"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Czynność końcowa"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Podaj liczebność:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Czynność początkowa"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nazwa powiązania"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Komunikat"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Podaj nazwę powiązania:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "NIEZDEFINIOWANE"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nazwa roli"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Wybierz"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Podaj nazwę roli:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Operacja z tą samą nazwą i sygnaturą już istnieje. Nie możesz jej ponownie "
+"dodać."
+
+#: 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 "Niedozwolona nazwa."
+
+#: 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 "Nieprawidłowa nazwa"
+
+#: 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 "Nazwa jest już wykorzystywana."
+
+#: 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 "Nazwa nie jest unikalna"
 
 #: 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."
+"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 ""
-"Co najmniej jeden z elementów ze schowka nie będzie wklejony ponieważ istnieje "
-"już element o tej \n"
+"Co najmniej jeden z elementów ze schowka nie będzie wklejony ponieważ "
+"istnieje już element o tej \n"
 "samej nazwie. Pozostałe elementy będą wklejone."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -298,1336 +255,1517 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Nie można utworzyć folderu"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Podaj nazwę stanu"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Ustawienia ogólne"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Podaj nazwę nowego stanu:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Pakiet jest przestrzenią nazw"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Wprowadź czynność"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Destruktory wirtualne"
 
-#: 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 "Podaj nazwę nowej czynności:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generowanie pustych konstruktorów"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nowa czynność"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generowanie metod akcesora"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Model UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operacje są kodem włączanym"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Perspektywa logiczna"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Akcesory są kodem włączanym"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Perspektywa przypadków użycia"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Akcesory są publiczne"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Perspektywa komponentów"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importowanie pliku: %1 Postęp: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Perspektywa wydania"
+#: 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 "Gotowe."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model encja-związek"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Czy zakres %1 jest przestrzenią nazw czy klasą?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Typy danych"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Import C++ wymaga Twojej pomocy"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Bieżący plik został zmodyfikowany.\n"
-"Zapisać go?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Przestrzeń nazw"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Plik %1 nie istnieje."
+#: 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 "Klasa"
 
-#: 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 "Błąd wczytywania"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Błąd wewnętrzny"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Plik %1 zdaje się być uszkodzonym."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Błąd składni przed '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Nie znaleziono żadnego pliku XMI w skompresowanym pliku %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Błąd parsowania przed '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Wystąpił problem przy wczytywaniu rozpakowanego pliku: %1."
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Wystąpiły problemy przy wczytywaniu pliku: %1."
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "Oczekiwano wyrażenia"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Wystąpiły problemy przy wczytywaniu pliku: %1."
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Błąd składni deklaracji"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagram przypadków użycia"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "Oczekiwano }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagram klasy"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "Oczekiwano przestrzeni nazw"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagram sekwencji"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "Oczekiwano {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagram kooperacji"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Oczekiwano nazwy przestrzeni nazw"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagram stanu"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Do deklaracji potrzeba określenia typu"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagram czynności"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "Oczekiwano deklaracji"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagram komponentu"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Oczekiwano stałego wyrażenia"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagram wydania"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "Oczekiwano ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagram encja-związek"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "brak }"
 
-#: 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 "Nazwa"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Oczekiwano inicjatorów składowych"
 
-#: 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 "Podaj nazwę:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Oczekiwano określenia klasy bazowej"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Niedozwolona nazwa dla diagramu."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Oczekiwano klauzuli inicjatora"
 
-#: 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 "Nieprawidłowa nazwa"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Oczekiwano identyfikatora"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Istnieje już diagram z tą nazwą."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Oczekiwano id typu"
 
-#: 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 "Nazwa nie jest unikalna"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Oczekiwano nazwy klasy"
 
-#: 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 "Niedozwolona nazwa."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "Oczekiwano warunku"
 
-#: 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 "Nazwa jest już wykorzystywana."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "Oczekiwano instrukcji"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Podana nazwa nie jest unikalna.\n"
-"Czy tego chciałeś?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "do inicjalizacji oczekiwano"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nazwa nie jest unikalna"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "oczekiwano catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Użyj nazwy"
+#: 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 "&Własności"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Podaj nową nazwę"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Czynność początkowa"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Na pewno chcesz usunąć diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Czynność końcowa"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Usunięcie diagramu"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Rozgałęzienie/Scalenie"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Ustawianie dokumentu..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Rozwidlenie/Połączenie"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Określanie odniesień do obiektu..."
+#: 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 "Ogólne"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Wczytywanie elementów UML..."
+#: 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 "Własności ogólne"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Wczytywanie diagramów..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Typ czynności:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nazwa czynności:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Dokumentacja"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Do zewnętrznego katalogu"
+#: 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 "Czcionka:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Podaj nazwę modelu"
+#: 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 "Ustawienia czcionek"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Podaj nową nazwę modelu:"
+#: 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 "Kolor"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Perspektywy"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Kolory elementów interfejsu"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Podana nazwa jest nieprawidłowa.\n"
-"Proces tworzenia został przerwany."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Czynności"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nieprawidłowa nazwa"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nowa czynność..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Podana nazwa nie jest unikalna!\n"
-"Proces tworzenia został przerwany."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Usuń zakotwiczenie"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Tworzenie przerwane"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Zmiana nazwy"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Wczytywanie widoku list..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nowa czynność"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Folder musi być opróżniony przed usunięciem."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nowa czynność"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Folder nie jest pusty"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Zmiana nazwy czynności"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Operacja z tą samą nazwą i sygnaturą już istnieje. Nie możesz jej ponownie "
-"dodać."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Podaj nową nazwę czynności:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Podaj nazwę czynności"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nazwa:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nowy_stan"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Typ:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Uogólnienie"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Powiązania"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Powiązanie z samym sobą"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Własności powiązania"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Komunikat kooperacji"
+#: 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 "Ustawienia ogólne"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Komunikat sekwencji"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Role"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Komunikat kooperacji wysyłany do siebie"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Ustawienia roli"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Komunikat sekwencji wysyłany do siebie"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Czcionka powiązania"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizacja"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Własności roli A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Powiązanie jednokierunkowe"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Własności roli B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Eksportuj"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Widoczność roli A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Widoczność roli B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nowy"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Zmienność roli A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "P&okaż"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Zmienność roli B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kod"
+msgid "Rolename:"
+msgstr "Nazwa roli:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktywny &język"
+msgid "Multiplicity:"
+msgstr "Liczebność:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentacja"
+msgid "Public"
+msgstr "Public"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Slash-Slash (//)"
+msgid "Private"
+msgstr "Private"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Slash-gwiazdka (/**  */)"
+msgid "Protected"
+msgstr "Protected"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Styl:"
+msgid "Implementation"
+msgstr "Implementacja"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Generowanie kodu C++</p>"
+msgid "Changeable"
+msgstr "Zmienna"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Ogólne"
+msgid "Frozen"
+msgstr "Zamrożona"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Generowanie ciała metody"
+msgid "Add only"
+msgstr "Tylko dodawanie"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Użyj następujących dla klas w generowanym kodzie:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nazwa klasy:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nazwa aktora:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "wektor"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nazwa pakietu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Zmienna</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nazwa przypadku użycia:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nazwa interfejsu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nazwa komponentu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nazwa artefaktu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Napis</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Nazwa wyliczenia:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nazwa typu danych:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nazwa encji:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globalny?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Nazwa &stereotypu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Nazwa &pakietu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nazwa klasy"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Klasa a&bstrakcyjna"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Plik dołączany</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Klasa a&bstrakcyjna"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generowanie projektu"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Wykonywalna"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Utworzenie dokumentu budowania ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Kreśl jako"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Metody automatycznie generowane"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Domyślne"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Metody pustego konstruktora"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Wypełnienie:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Metody akcesora powiązania"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&lioteka"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Metody akcesora atrybutu"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tablica"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Public"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Widoczność"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Private"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&ublic"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Protected"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivate"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Z obiektu-przodka"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tected"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Domyślny zasięg akcesora atrybutu:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Impl&ementacja"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Domyślny zasięg pola powiązania:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nazwa klasy:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Z roli przodka"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nazwa egzemplarza:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generowanie kodu Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Kreśl jako aktora"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Klucz (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Egzemplarz wielokrotny"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Początek-koniec (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Pokaż rozbicie"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generowanie kodu Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nazwa komponentu:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nazwa węzła:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nazwa stereotypu:"
+
+#: 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 ""
+"Wybrana nazwa jest już użyta.\n"
+"Nazwa zostaje usunięta."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Nazwa nie jest unikalna"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atrybuty"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Nowy atrybut..."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacje"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nowa op&eracja..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Szablony"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Nowy &szablon..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Literały wyliczeniowe"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Nowy &literał wyliczeniowy"
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atrybuty encji"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "&Nowy atrybut encji..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Usuń zakotwiczenie"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Własności"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Pokaż"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operac&je"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Widoczność"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Sygnatura o&peracji"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&kiet"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&rybuty"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&yp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Sygnatura atr&ybutu"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Kreśl jako okrąg"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Wyświetlanie"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Ustawienia wyświetlania"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Ustawienia atrybutu"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Ustawienia operacji"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Ustawienia szablonów"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Ustawienia literałów wyliczeniowych"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Ustawienia atrybutów encji"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Zawieranie"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Ustawienia zawartości"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Powiązania klasy"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nowa_klasa"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nowa klasa"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atrybuty klasy"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operacje klasy"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Ustawienia generowania kodu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Język"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generowanie"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Foldery"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Koniec"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Wszystkie wygenerowane pliki zapisać w folderze:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kod wygenerowany"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Przeglądanie..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Kod nie wygenerowany"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "P&rzeglądanie..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Kod jeszcze nie wygenerowany"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Włączyć pliki nagłówkowe z folderu:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Katalog %1 nie istnieje. Czy chcesz go teraz stworzyć?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Pliki wygenerowanego kodu będą zapisane w tym folderze"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Katalog wyjściowy nie istnieje"
 
-#. 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"
-msgstr "Pliki w tym folderze będą użyte jako pliki nagłówkowe w generowanym kodzie"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Utwórz folder"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Polityka zastępowania"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Nie generuj pliku"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
-msgstr "Jeśli plik o nazwie podanej przez generator kodu istnieje:"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
+msgstr ""
+"Nie można utworzyć katalogu.\n"
+"Upewnij się czy masz prawo zapisu do katalogu nadrzędnego lub wybierz inny, "
+"poprawny, katalog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Za&stąp"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Błąd podczas tworzenia katalogu."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Zastąp istniejące pliki w folderze docelowym"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Wybierz poprawny katalog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "P&ytaj"
+#: 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 ""
+"Katalog wyjściowy istnieje, ale nie można do niego zapisywać.\n"
+"Ustaw właściwe uprawnienia lub wybierz inny katalog."
 
-#. 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"
-msgstr "Jeśli plik o podanej nazwie już istnieje, pytaj co robić"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Błąd w zapisie do katalogu wyjściowego"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Użyj innej nazwy"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 nie wydaje się być katalogiem. Proszę wybrać poprawny katalog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Jeśli plik już istnieje w folderze docelowym, wybierz inną nazwę przez dodanie "
-"przyrostka do nazwy pliku"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Proszę wybrać poprawny katalog"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "Formatting"
-msgstr "Formatowanie"
+msgid "Code Viewer"
+msgstr "Podgląd kodu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Wiersze"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Opcje niedostępne.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Styl zakończenia wiersza:"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Typ wcięcia:"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtr"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Wielkość wcięcia:"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Bieżący diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid "*NIX (\"\\n\")"
-msgstr "*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Wszystkie diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid "Windows (\"\\r\\n\")"
-msgstr "Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "W&ybrane diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Typ diagramu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Bez wcięcia"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Wybór"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Zakładka"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Przypadek użycia"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Spacja"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Kooperacja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Szczegółowość komentarzy"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekwencja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stan"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponent"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Wdrożenie"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Nie został wybrany żaden diagram."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Format, do którego zostaną wyeksportowane obrazki"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Notatka dokumentacyjna"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Docelowy plik już istnieje"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Zapisać komentarze &dla sekcji nawet jeśli sekcja\n"
-"jest pusta"
+"Plik %1 już istnieje w %2.\n"
+"\n"
+"Umbrello może zastąpić plik, wygenerować podobną\n"
+"nazwę pliku lub nie generować tego pliku."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Przypisz do pozostałych plików"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Zastąp"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generuj podobną nazwę pliku"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Nie generuj pliku"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Własności parametru"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Typ:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nazwa:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Wartość &początkowa:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Kierunek przekazywania"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Zapisać komentarze oznaczające różne sekcje (publiczna, prywatna itd.) w "
-"klasie, nawet jeśli są puste"
+"\"in\" jest parametrem tylko do odczytu, \"out\" jest parametrem tylko do "
+"zapisu, a\"inout\" jest parametrem do zapisu i odczytu."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Zapisać komentarze dokumentacyjne nawet jeśli puste"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Zawarte elementy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Zapisać komentarze dokumentacyjne &dla klasy i metody nawet jeśli puste"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Wybór operacji"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Ustawienia języka"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Numer sekwencji:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Asystent generowania kodu"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operacja klasy:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Wybór klas"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Operacja własna:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Ustawienia Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interfejs użytkownika"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Ustawienia interfejsu użytkownika"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Kolor linii:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Kolor domyśln&y"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Kolor wypełnienia:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Kolor domyśln&y"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Szerokość linii:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Domyślna sz&erokość"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Użyj koloru wypełnienia"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Umieść wszystkie klasy, dla których należy generować\n"
-"kod, w liście po prawej stronie."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Dodaj klasę do generatora kodu"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Włą&cz cofanie"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Wybrane klasy"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Zastosuj diagramy z zakładkami"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Usuń klasę z generatora kodu"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Użyj nowych generatorów C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Dostępne klasy"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Użyj kątowych linii powiązania"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Stan generowania kodu"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Autozapis"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Wciśnij przycisk Generowanie, aby rozpocząć generowanie kodu"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Włą&czenie autozapisu"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Stan generowania"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Podaj interwał automatycznego zapisu (minuty):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Podgląd kodu"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Ustaw przedrostek autozapisu:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Pokaż ukryte bloki"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Dane z automatycznego zapisu zostaną zapisane w ~/autosave.xmi jeśli "
+"automatyczny zapis wystąpi zanim ręcznie zapiszesz plik.</p><p>Jeśli plik "
+"został już zapisany, automatyczny zapis zostanie wykonany w tym samym "
+"katalogu, co plik, a nazwa pliku zapisanego automatycznie będzie nazwą pliku "
+"z podanym przyrostkiem.</p><p>Jeśli przyrostek jest równy przyrostkowi "
+"zapisywanego pliku, plik zapisany automatycznie zastąpi Twój plik.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">tutaj nazwa komponentu</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Rozpoczęcie"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Pokaż typ bloku"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logo sta&rtowe"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Kolory"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Podpowiedź dnia"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Czcionka:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Wczytaj poprzedni projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papier:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Rozpocznij nowy projekt z diagramem:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Zaznaczenie:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Bez diagramu"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">blok obiektu UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagram klasy"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Blok ukryty:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagram przypadków użycia"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Nieredagowalny tekst:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagram sekwencji"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Redagowalny tekst:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagram kooperacji"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Własności diagramu"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagram stanu"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nazwa:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagram czynności"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Powiększenie:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagram komponentów"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+# KLCHECKME
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagram dystrybucji"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Ustawienia klasy"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Pokaż &widoczność"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Pokaż atrybuty"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Pokaż operacje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Pokaż stereot&yp"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Pokaż sygnaturę atrybutu"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Pokaż pakiet"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Pokaż sygnaturę operacji"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Pokaż &siatkę"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Zasięg początkowy"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Przyciągaj &do siatki"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Domyślny zasięg atrybutu:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Rozmiar komponentu wg siatki"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Domyślny zasięg operacji:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generowanie kodu"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Ustawienia generowania kodu"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Ustawienia podglądu kodu"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Stan początkowy"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Stan końcowy"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Typ stanu:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nazwa stanu:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Kolor elementu interfejsu"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Własności atrybutu"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Zasięg &klasyfikatora (\"statyczny\")"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Public"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&ected"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "&Implementacja"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Wprowadzono niedozwoloną nazwę atrybutu."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nieprawidłowa nazwa atrybutu"
+
+#: dialogs/umlattributedialog.cpp:163
 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 ""
-"Wielkość komponentu wg siatki będzie wielokrotnością odstępu siatki.\n"
-"Jeśli włączone jest przyciąganie do siatki, komponent będzie zawsze wyrównywany "
-"do siatki."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Podana nazwa atrybutu jest wykorzystana w tej operacji."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Odstęp siatki:  "
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Nazwa atrybutu nie jest unikalna"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Własności atrybutu encji"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Domyślna wartość:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Szerokość linii:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Długość/Wartości:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Eksportuj wszystkie widoki"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automatyczne zwiększanie"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Katalog do zapisu diagramów:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Dopuść pus&te"
 
-#. 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"
-msgstr "Katalog bazowy do zapisu obrazków"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atrybuty:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Typ &obrazka:"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksowanie"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Format, do którego zostaną wyeksportowane obrazki"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "Żade&n"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Użyj &katalogów"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Podstawowy"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unikalny"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Wprowadzono niedozwoloną nazwę atrybutu encji."
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nieprawidłowa nazwa atrybutu encji"
+
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Tworzy w katalogu docelowym taką samą strukturę drzewiastą, jaka była używana w "
-"dokumencie do przechowywania widoków"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "Podana nazwa atrybutu encji jest już wykorzystana w tej operacji."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Nazwa atrybutu encji nie jest unikalna"
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Własności operacji"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Operacja &abstrakcyjna"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Zapytanie (\"stałe\")"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametry"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&wy parametr..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Podano niedozwoloną nazwę parametru."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nieprawidłowa nazwa parametru"
+
+#: 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 ""
-"Widoki są przechowywane w dokumencie w folderach. Ta opcja powoduje stworzenie "
-"takiej samej struktury drzewiastej w wybranym katalogu bazowym.\n"
-"Tylko foldery stworzone przez użytkownika są tworzone w katalogu bazowym "
-"(widoki logiczne, widoki przypadków użycia, itp. nie są stworzone)."
+"Parametr o podanej nazwie jest już\n"
+"użyty w tej operacji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Nazwa parametru nie jest unikalna"
+
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Parametr o podanej nazwie jest już użyty w tej operacji."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Podano nieprawidłową nazwę operacji"
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nieprawidłowa nazwa operacji"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operacja z taką sygnaturą już istnieje w %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Wybierz inną nazwę lub listę parametrów."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "Własności roli"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Nazwa roli:"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Własności szablonu"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Liczebność:"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Podano nieprawidłową nazwę szablonu."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Zmienność roli"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nieprawidłowa nazwa szablonu"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Tylko dodawanie"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Parametr szablonu o podanej nazwie jest już użyty w tej operacji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zamrożona"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Nazwa szablonu nie jest unikalna"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Zmienna"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Ustawienia wyświetlania klas"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Widoczność roli"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Kolory diagramu"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementacja"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Podano niedozwoloną nazwę."
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Witaj w Umbrello.</p>\n"
-"<p>Diagramy UML pozwolą Ci zaprojektować i udokumentować oprogramowanie "
-"obiektowe.  Bardzo dobrym wstępem do użytkowania UML jest  <a "
-"href=\"help:/umbrello\">Podręcznik Umbrello</a>.</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Podana nazwa nie jest unikalna."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Witamy w Umbrello 1.5. W tej wersji nowe funkcje to między innymi: klasy "
-"asocjacyjne, generowanie kodu Ruby, zewnętrzne katalogi i możliwość zmiany "
-"interfejsu w klasach.</p>\n"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nazwa nie jest unikalna"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Diagramy z zakładkami i zewnętrzne katalogi wzajemnie się wykluczają. Jeśli "
-"potrzebujesz zewnętrznych katalogów, wyłącz opcję &quot;Użyj diagramów z "
-"zakładkami&quot; w Ustawieniach ogólnych.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linia:"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Wielkość większości elementów diagramu nie może być zmieniana. Jest ona "
-"dostosowywana do ich zawartości.\n"
-"Wielkości pudełek, notatek i sekwencji komunikatów diagramów mogą być zmieniane "
-"przez kliknięcie i przeciągnięcie czerwonego kwadratu.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Wypełnienie:"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Jeśli chcesz dodać istniejącą klasę do diagramu, wystarczy przeciągnąć ją z "
-"perspektywy drzewiastej.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Domyśln&e"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Agent refaktoringu pozwala przemieszczać operacje pomiędzy klasą, jej "
-"pochodnymi i klasą bazową.\n"
-"Kliknij prawym przyciskiem myszki na klasie aby uruchomić agenta "
-"refaktoringu.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Użyj wypełnienia"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Obiekty diagramu sekwencji mogą mieć pudełko destruktora i mogą być "
-"wykreślane jako aktorzy. Podwójne kliknięcie na którymś\n"
-"otworzy okno dialogowe Własności.</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Eksportowanie wszystkich widoków..."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Komunikaty diagramu sekwencji mogą zachowywać się jak konstruktorzy. Kliknij "
-"na pudełku obiektu (a nie na pionową linie) aby uczynić go konstruktorem.</p>\n"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Jakieś błędy wystąpiły podczas eksportowania obrazków:"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Diagramy sekwencji obsługują komunikaty do samych siebie. Kliknij ponownie "
-"na tę samą pionową linię aby utworzyć komunikat automatyczny.</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 "Wystąpiły problemy przy zapisywaniu pliku: %1."
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Jeśli przy wczytywaniu zewnętrznego pliku nic nie wyświetla się w widoku list "
-"spróbuj zapisać model pod inną nazwą,\n"
-"następnie zamknąć i ponownie wczytać zapisany plik. Z reguły widok list zostaje "
-"poprawnie wypełniony.\n"
-"</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 "Błąd zapisu"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Operacje Wytnij i Kopiuj mogą również umieszczać obrazki w schowku PNG, "
-"dzięki czemu mogą być one wklejane do programu KWord\n"
-"i innych programów.</p>\n"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Autonomiczny generator kodu modelera UML Umbrello"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Powiązania nie muszą być w liniach prostych. Podwójne kliknięcie na którymś "
-"powiązaniu utworzy przesuwalny punkt.</p>\n"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Plik do przekształcenia"
 
-#: tips.txt:71
-msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr "<p>W ustawieniach Umbrello można włączyć automatyczny zapis projektu.</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Plik XSLT, który ma zostać użyty"
 
-#: 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 ""
-"<p>Czy brak jakiejś potrzebnej cechy w Umbrello? Daj nam znać. \n"
-"Informacja może być podana za pomocą narzędzia Raport o błędzie (menu Pomoc)\n"
-"lub wysłana na listę dyskusyjną UML Devel.</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 autorzy modelera UML "
+"Umbrello"
 
-#: tips.txt:86
-msgid "<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Wszystkie zaznaczone obiekty mogą być usunięte za pomocą Del lub "
-"Backspace.</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autorzy Umbrello UML Modeller"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Jeżeli znalazłeś błąd w Umbrello - daj nam znać. \n"
-"Błędy można przekazywać za pomocą narzędzia Raport o błędzie w menu Pomoc.</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 "Nazwa"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Wciśnięcie Esc powoduje zmianę bieżącego narzędzia na narzędzie wyboru.\n"
-"Backspace powoduje uaktywnienie uprzednio wykorzystywanego narzędzia.</p>\n"
+#: 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 "Podaj nazwę:"
 
-#: tips.txt:103
-msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr "<p> Wszystkie obiekty można wybrać za pomocą Ctrl-A.</p>\n"
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Podaj nazwę operacji:"
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Można utworzyć i skonfigurować nową klasę za pomocą Asystenta nowej klasy w "
-"menu Kod.</p>\n"
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Wprowadź nowy tekst:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "BŁĄD"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Zmiana tekstu"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Katalog %1 nie istnieje."
+
+#: 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 "Błąd wczytywania"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Nie można otworzyć katalogu %1."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1681,6 +1819,10 @@ msgstr "Nowa operacja"
 msgid "Select Operation..."
 msgstr "Wybór operacji..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Zmiana tekstu..."
@@ -1730,6 +1872,19 @@ msgstr "Nowy"
 msgid "Rename..."
 msgstr "Zmiana nazwy..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Błąd wklejania"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Kolor linii..."
@@ -1758,14 +1913,26 @@ msgstr "Wewnętrzny folder"
 msgid "Import Classes..."
 msgstr "Import klas..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pakiet"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Podsystem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagram komponentów"
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Węzeł"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagram wydania..."
@@ -1774,10 +1941,18 @@ msgstr "Diagram wydania..."
 msgid "Folder"
 msgstr "Folder"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Encja"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagram encja-związek..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktor"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagram przypadków użycia..."
@@ -1814,6 +1989,18 @@ msgstr "Nowy atrybut encji..."
 msgid "Export as Picture..."
 msgstr "Eksportuj jako obrazek..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfejs"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Typ danych"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Wyliczenie"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagram klasy..."
@@ -1834,26 +2021,10 @@ msgstr "Diagram sekwencji..."
 msgid "Collaboration Diagram..."
 msgstr "Diagram kooperacji..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atrybuty"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacje"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Tylko publiczne"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Widoczność"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Sygnatura operacji"
@@ -1866,11 +2037,6 @@ msgstr "Sygnatura atrybutu"
 msgid "Stereotype"
 msgstr "Stereotyp"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Pokaż"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atrybut..."
@@ -1895,14 +2061,6 @@ msgstr "Kolor wypełnienia"
 msgid "Use Fill Color"
 msgstr "Użyj koloru wypełnienia"
 
-#: 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 "Kolor"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktor..."
@@ -1931,10 +2089,26 @@ msgstr "Wyliczenie..."
 msgid "Package..."
 msgstr "Pakiet..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Stan początkowy"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Stan końcowy"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stan..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Czynność początkowa"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Czynność końcowa"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Podsystem..."
@@ -1979,6 +2153,14 @@ msgstr "Usuń zakotwiczenie"
 msgid "Change Association Name..."
 msgstr "Zmiana nazwy powiązania..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Wyczyść diagram"
@@ -2013,197 +2195,104 @@ msgstr "katalog pliku"
 
 #: main.cpp:43
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
-msgstr "odzwierciedla strukturę drzewiastą widoków w dokumencie w katalogu docelowym"
+"keep the tree structure used to store the views in the document in the "
+"target directory"
+msgstr ""
+"odzwierciedla strukturę drzewiastą widoków w dokumencie w katalogu docelowym"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 autorzy modelera UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Niewłaściwe użycie powiązania."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Błąd powiązania"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Katalog %1 nie istnieje."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Nie można otworzyć katalogu %1."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Marek Kuziel,Cezary Morga"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "fi_corax@op.pl,cezarym@pf.pl"
-
-#: 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 "Gotowe."
-
-#: 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 ""
-"Przytrzymaj shift lub control, żeby przesuwać w osi X. Przytrzymaj shift i "
-"control, żeby przesuwać w osi Y. Prawy klawisz myszy anuluje przesuwanie."
-
-#: 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 ""
-"Przytrzymaj shift lub control, żeby przesuwać w osi X. Przytrzymaj shift i "
-"control, żeby przesuwać w osi Y. Prawy klawisz myszy anuluje zmianę rozmiaru."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Czy zakres %1 jest przestrzenią nazw czy klasą?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Import C++ wymaga Twojej pomocy"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Przestrzeń nazw"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importowanie pliku: %1 Postęp: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Błąd wewnętrzny"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Błąd składni przed '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Błąd parsowania przed '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nowy_aktor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "Oczekiwano wyrażenia"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nowy_przypadek_użycia"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Błąd składni deklaracji"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nowy_pakiet"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "Oczekiwano }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nowy_komponent"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "Oczekiwano przestrzeni nazw"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nowy_węzeł"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "Oczekiwano {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nowy_artefakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Oczekiwano nazwy przestrzeni nazw"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nowy_interfejs"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Do deklaracji potrzeba określenia typu"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nowy_typ_danych"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "Oczekiwano deklaracji"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nowe_wyliczenie"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Oczekiwano stałego wyrażenia"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nowe_encja"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "Oczekiwano ')'"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nowy_folder"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "brak }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nowe_powiązanie"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Oczekiwano inicjatorów składowych"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nowy_obiekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Oczekiwano określenia klasy bazowej"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Oczekiwano klauzuli inicjatora"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Pusty"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Oczekiwano identyfikatora"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Błędnie sformułowany argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Oczekiwano id typu"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Nieznany typ argumentu"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Oczekiwano nazwy klasy"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Niewłaściwa nazwa metody"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "Oczekiwano warunku"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Zwrócony typ nieznany"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "Oczekiwano instrukcji"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Nieokreślony błąd"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "do inicjalizacji oczekiwano"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"To jest zastrzeżone słowo kluczowe dla języka ustawionego generatora kodu."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "oczekiwano catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Zastrzeżone słowo kluczowe"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2217,105 +2306,66 @@ msgstr "Podaj nazwę obiektu:"
 msgid "new_parameter"
 msgstr "nowy_parametr"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Ustawienia ogólne"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Pakiet jest przestrzenią nazw"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Destruktory wirtualne"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generowanie pustych konstruktorów"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generowanie metod akcesora"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operacje są kodem włączanym"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Akcesory są kodem włączanym"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Akcesory są publiczne"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Strona %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Podaj nazwę diagramu"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Dodanie klasy bazowej"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Podaj nową nazwę diagramu:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Dodanie klasy pochodnej"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Chcesz usunąć cały diagram.\n"
-"Czy aby na pewno?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Dodanie operacji"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Usunąć diagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Dodanie atrybutu"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Zmiana nazwy przerwana"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Dodanie interfejsu bazowego"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Zmiana nazwy elementu widoku list typu %1 nie została jeszcze zaimplementowana."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Dodanie interfejsu pochodnego"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkcja ta nie jest zaimplementowana"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Klasyfikatory bazowe"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Podana nazwa jest nieprawidłowa.\n"
-"Proces zmiany nazwy został przerwany."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Klasyfikatory pochodne"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nowe_powiązanie"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Podaj nazwę stanu"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nowy_atrybut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Podaj nazwę nowego stanu:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nowy_szablon"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Wprowadź czynność"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nowa_operacja"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Niewłaściwe użycie powiązania."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nowy_literał"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Błąd powiązania"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nowe_pole"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nowy_stan"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2469,11 +2519,6 @@ msgstr "&Eksportuj jako obrazek..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Eksportuj &wszystkie diagramy jako obrazki..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Własności"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Suwak powiększenia"
@@ -2558,21 +2603,28 @@ msgstr "&Dokumentacja"
 msgid "Opening file..."
 msgstr "Otwarcie pliku..."
 
+#: 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 "Tworzenie nowego dokumentu..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Wszystkie obsługiwane pliki (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Wszystkie obsługiwane pliki (*.xmi, *."
+"xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Nieskompresowane pliki XMI (*.xmi)\n"
 "*.xmi.tgz|Pliki XMI skompresowane metodą Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Pliki XMI skompresowane metodą Bzip2 (*.xmi.tar.bz2)\n"
@@ -2602,6 +2654,10 @@ msgstr ""
 "*.xmi.tar.bz2|Plik XMI skompresowany metodą Bzip2\n"
 "*|Wszystkie pliki"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2610,6 +2666,10 @@ msgstr ""
 "Plik %1 już istnieje.\n"
 "Zastąpić go?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Zastąp"
@@ -2645,8 +2705,8 @@ msgstr "Wklejanie zawartości schowka..."
 
 #: 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 ""
 "Umbrello nie mógł wkleić zawartości schowka. Obiekty w schowku mogą być "
 "nieodpowiedniego typu, żeby wkleić je tutaj."
@@ -2703,1247 +2763,1311 @@ msgstr "Wszystkie pliki"
 msgid "Select Code to Import"
 msgstr "Wybierz kod do importu"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nazwa klasy:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nazwa aktora:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nowy_atrybut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nazwa pakietu:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nowy_szablon"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nazwa przypadku użycia:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nowa_operacja"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nazwa interfejsu:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nowy_literał"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nazwa komponentu:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nowe_pole"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nazwa artefaktu:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Model UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Nazwa wyliczenia:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Perspektywa logiczna"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nazwa typu danych:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Perspektywa przypadków użycia"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nazwa encji:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Perspektywa komponentów"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Nazwa &stereotypu:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Perspektywa wydania"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Nazwa &pakietu:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model encja-związek"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Klasa a&bstrakcyjna"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Typy danych"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Klasa a&bstrakcyjna"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Bieżący plik został zmodyfikowany.\n"
+"Zapisać go?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Wykonywalna"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Plik %1 nie istnieje."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Kreśl jako"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Plik %1 zdaje się być uszkodzonym."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Domyślne"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Nie znaleziono żadnego pliku XMI w skompresowanym pliku %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&lioteka"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Wystąpił problem przy wczytywaniu rozpakowanego pliku: %1."
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tablica"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Wystąpiły problemy przy wczytywaniu pliku: %1."
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&ublic"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Wystąpiły problemy przy wczytywaniu pliku: %1."
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivate"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagram przypadków użycia"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagram klasy"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Impl&ementacja"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagram sekwencji"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nazwa klasy:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagram kooperacji"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nazwa egzemplarza:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagram stanu"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Kreśl jako aktora"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagram czynności"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Egzemplarz wielokrotny"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagram komponentu"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Pokaż rozbicie"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagram wydania"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nazwa komponentu:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagram encja-związek"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nazwa węzła:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Niedozwolona nazwa dla diagramu."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nazwa stereotypu:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Istnieje już diagram z tą nazwą."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Wybrana nazwa jest już użyta.\n"
-"Nazwa zostaje usunięta."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Nazwa nie jest unikalna"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linia:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Wypełnienie:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Domyśln&e"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Użyj wypełnienia"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Czynności"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nowa czynność..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Zmiana nazwy"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nowa czynność"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Zmiana nazwy czynności"
+"Podana nazwa nie jest unikalna.\n"
+"Czy tego chciałeś?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Podaj nową nazwę czynności:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Użyj nazwy"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Własności powiązania"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Podaj nową nazwę"
 
-#: 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 "Ustawienia ogólne"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Na pewno chcesz usunąć diagram %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Role"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Usunięcie diagramu"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Ustawienia roli"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Ustawianie dokumentu..."
 
-#: 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 "Ustawienia czcionek"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Określanie odniesień do obiektu..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Czcionka powiązania"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Wczytywanie elementów UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Własności szablonu"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Wczytywanie diagramów..."
 
-#: 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 "Własności ogólne"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Typ:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Do zewnętrznego katalogu"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nazwa:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Podaj nazwę modelu"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Podano nieprawidłową nazwę szablonu."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Podaj nową nazwę modelu:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nieprawidłowa nazwa szablonu"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Perspektywy"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Parametr szablonu o podanej nazwie jest już użyty w tej operacji."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Nazwa szablonu nie jest unikalna"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Podana nazwa jest nieprawidłowa.\n"
+"Proces tworzenia został przerwany."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Własności atrybutu encji"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nieprawidłowa nazwa"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Domyślna wartość:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Podana nazwa nie jest unikalna!\n"
+"Proces tworzenia został przerwany."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Długość/Wartości:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Tworzenie przerwane"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automatyczne zwiększanie"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Wczytywanie widoku list..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Dopuść pus&te"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Folder musi być opróżniony przed usunięciem."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atrybuty:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Folder nie jest pusty"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksowanie"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Zmiana nazwy przerwana"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "Żade&n"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Zmiana nazwy elementu widoku list typu %1 nie została jeszcze "
+"zaimplementowana."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Podstawowy"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkcja ta nie jest zaimplementowana"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Podana nazwa jest nieprawidłowa.\n"
+"Proces zmiany nazwy został przerwany."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unikalny"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Strona %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Wprowadzono niedozwoloną nazwę atrybutu encji."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Podaj nazwę diagramu"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nieprawidłowa nazwa atrybutu encji"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Podaj nową nazwę diagramu:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Podana nazwa atrybutu encji jest już wykorzystana w tej operacji."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Nazwa atrybutu encji nie jest unikalna"
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Chcesz usunąć cały diagram.\n"
+"Czy aby na pewno?"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Wyświetlanie"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Usunąć diagram?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Ustawienia wyświetlania klas"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Eksportowanie widoku..."
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Kolory diagramu"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Podczas eksportowania obrazka wystąpił błąd:\n"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Podano niedozwoloną nazwę."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Plik %1 już istnieje.\n"
+"Zastąpić go?"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Podana nazwa nie jest unikalna."
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Plik już istnieje"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Typ:"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Nie można utworzyć katalogu: %1"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Ustawienia Umbrello"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Nie można zapisać pustego diagramu"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interfejs użytkownika"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Wystąpił błąd podczas zapisywania diagramu do %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Ustawienia interfejsu użytkownika"
+#: 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 ""
+"Przytrzymaj shift lub control, żeby przesuwać w osi X. Przytrzymaj shift i "
+"control, żeby przesuwać w osi Y. Prawy klawisz myszy anuluje przesuwanie."
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Kolor linii:"
+#: 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 ""
+"Przytrzymaj shift lub control, żeby przesuwać w osi X. Przytrzymaj shift i "
+"control, żeby przesuwać w osi Y. Prawy klawisz myszy anuluje zmianę rozmiaru."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Kolor domyśln&y"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Obiekt"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Kolor wypełnienia:"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Komunikat synchroniczny"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Kolor domyśln&y"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Komunikat asynchroniczny"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Szerokość linii:"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etykieta"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Domyślna sz&erokość"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Notatka"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Użyj koloru wypełnienia"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Ramka"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Włą&cz cofanie"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Związek"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Zastosuj diagramy z zakładkami"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Powiązanie kierunkowe"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Użyj nowych generatorów C++/Java/Ruby"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementuje (Uogólnienie/Realizacja)"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Użyj kątowych linii powiązania"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Pełna historia"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Autozapis"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Skrócona historia"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Włą&czenie autozapisu"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Dołącz"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Podaj interwał automatycznego zapisu (minuty):"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Rozdziel"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Ustaw przedrostek autozapisu:"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Połączenie"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Dane z automatycznego zapisu zostaną zapisane w ~/autosave.xmi jeśli "
-"automatyczny zapis wystąpi zanim ręcznie zapiszesz plik.</p>"
-"<p>Jeśli plik został już zapisany, automatyczny zapis zostanie wykonany w tym "
-"samym katalogu, co plik, a nazwa pliku zapisanego automatycznie będzie nazwą "
-"pliku z podanym przyrostkiem.</p>"
-"<p>Jeśli przyrostek jest równy przyrostkowi zapisywanego pliku, plik zapisany "
-"automatycznie zastąpi Twój plik.</p></qt>"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Wybór"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Rozpoczęcie"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Czynność przejściowa"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logo sta&rtowe"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Komunikat"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Podpowiedź dnia"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "NIEZDEFINIOWANE"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Wczytaj poprzedni projekt"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Wybierz"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Rozpocznij nowy projekt z diagramem:"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Bez diagramu"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagram klasy"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagram przypadków użycia"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagram sekwencji"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Pokaż operacje"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagram kooperacji"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagram stanu"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Wyczyść diagram"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagram czynności"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagram komponentów"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Uogólnienie"
 
-# KLCHECKME
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagram dystrybucji"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Ustawienia klasy"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Pokaż &widoczność"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nazwa powiązania"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Pokaż atrybuty"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Pokaż operacje"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Pokaż stereot&yp"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Pokaż sygnaturę atrybutu"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Domyślne"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Pokaż pakiet"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Zasięg początkowy"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-Slash (//)"
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Domyślny zasięg atrybutu:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-gwiazdka (/**  */)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Domyślny zasięg operacji:"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Styl:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generowanie kodu"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Generowanie kodu C++</p>"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Ustawienia generowania kodu"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Generowanie ciała metody"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Ustawienia podglądu kodu"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Użyj następujących dla klas w generowanym kodzie:"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Własności operacji"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Operacja &abstrakcyjna"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "wektor"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Zasięg &klasyfikatora (\"statyczny\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Zmienna</b>"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Zapytanie (\"stałe\")"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "&Implementacja"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametry"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Napis</p>"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&wy parametr..."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Podano niedozwoloną nazwę parametru."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nieprawidłowa nazwa parametru"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globalny?</i>"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Parametr o podanej nazwie jest już\n"
-"użyty w tej operacji."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Nazwa parametru nie jest unikalna"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nazwa klasy"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid "The parameter name you have chosen is already being used in this operation."
-msgstr "Parametr o podanej nazwie jest już użyty w tej operacji."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Plik dołączany</p></i>"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Podano nieprawidłową nazwę operacji"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generowanie projektu"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nieprawidłowa nazwa operacji"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Utworzenie dokumentu budowania ANT"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid "An operation with that signature already exists in %1.\n"
-msgstr "Operacja z taką sygnaturą już istnieje w %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Metody automatycznie generowane"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Wybierz inną nazwę lub listę parametrów."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Metody pustego konstruktora"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Własności roli A"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Metody akcesora powiązania"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Własności roli B"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Metody akcesora atrybutu"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Widoczność roli A"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Z obiektu-przodka"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Widoczność roli B"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Domyślny zasięg akcesora atrybutu:"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Zmienność roli A"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Domyślny zasięg pola powiązania:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Zmienność roli B"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Z roli przodka"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Zawarte elementy"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generowanie kodu Java</p>"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Notatka dokumentacyjna"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Klucz (#)"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Nowy atrybut..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Początek-koniec (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nowa op&eracja..."
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generowanie kodu Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Szablony"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Język"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Nowy &szablon..."
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Foldery"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Literały wyliczeniowe"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Wszystkie wygenerowane pliki zapisać w folderze:"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Nowy &literał wyliczeniowy"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Przeglądanie..."
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atrybuty encji"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "P&rzeglądanie..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "&Nowy atrybut encji..."
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Włączyć pliki nagłówkowe z folderu:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Czynność początkowa"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Pliki wygenerowanego kodu będą zapisane w tym folderze"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Czynność końcowa"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Pliki w tym folderze będą użyte jako pliki nagłówkowe w generowanym kodzie"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Typ czynności:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Polityka zastępowania"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nazwa czynności:"
+#: 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 "Jeśli plik o nazwie podanej przez generator kodu istnieje:"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Kolory elementów interfejsu"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Za&stąp"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Własności atrybutu"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Zastąp istniejące pliki w folderze docelowym"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Wartość &początkowa:"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "P&ytaj"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Public"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Jeśli plik o podanej nazwie już istnieje, pytaj co robić"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Wprowadzono niedozwoloną nazwę atrybutu."
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Użyj innej nazwy"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nieprawidłowa nazwa atrybutu"
+#: 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 ""
+"Jeśli plik już istnieje w folderze docelowym, wybierz inną nazwę przez "
+"dodanie przyrostka do nazwy pliku"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid "The attribute name you have chosen is already being used in this operation."
-msgstr "Podana nazwa atrybutu jest wykorzystana w tej operacji."
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatowanie"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Nazwa atrybutu nie jest unikalna"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Wiersze"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Wybór operacji"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Styl zakończenia wiersza:"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Numer sekwencji:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Typ wcięcia:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operacja klasy:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Wielkość wcięcia:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Operacja własna:"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramy"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtr"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Bieżący diagram"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Bez wcięcia"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Wszystkie diagramy"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Zakładka"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "W&ybrane diagramy"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Spacja"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Typ diagramu"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Szczegółowość komentarzy"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Wybór"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Zapisać komentarze &dla sekcji nawet jeśli sekcja\n"
+"jest pusta"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Kooperacja"
+#: 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 ""
+"Zapisać komentarze oznaczające różne sekcje (publiczna, prywatna itd.) w "
+"klasie, nawet jeśli są puste"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekwencja"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Zapisać komentarze dokumentacyjne nawet jeśli puste"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Wdrożenie"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Zapisać komentarze dokumentacyjne &dla klasy i metody nawet jeśli puste"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Nie został wybrany żaden diagram."
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Ustawienia języka"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Ustawienia wyświetlania"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Asystent generowania kodu"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Ustawienia atrybutu"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Wybór klas"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Ustawienia operacji"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Umieść wszystkie klasy, dla których należy generować\n"
+"kod, w liście po prawej stronie."
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Ustawienia szablonów"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Dodaj klasę do generatora kodu"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Ustawienia literałów wyliczeniowych"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Wybrane klasy"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Ustawienia atrybutów encji"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Usuń klasę z generatora kodu"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Ustawienia zawartości"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Dostępne klasy"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Powiązania"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Stan generowania kodu"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Powiązania klasy"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Wciśnij przycisk Generowanie, aby rozpocząć generowanie kodu"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operac&je"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Stan generowania"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Widoczność"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Pokaż ukryte bloki"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Sygnatura o&peracji"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">tutaj nazwa komponentu</p>"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&kiet"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&rybuty"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Pokaż typ bloku"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&yp"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Kolory"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Sygnatura atr&ybutu"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Czcionka:"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Kreśl jako okrąg"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papier:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Stan początkowy"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Zaznaczenie:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Stan końcowy"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">blok obiektu UML:</p>"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Typ stanu:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Blok ukryty:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nazwa stanu:"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Nieredagowalny tekst:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Kolor elementu interfejsu"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Redagowalny tekst:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nowa_klasa"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Własności diagramu"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nowa klasa"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Powiększenie:"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atrybuty klasy"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operacje klasy"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Pokaż &siatkę"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Własności parametru"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Przyciągaj &do siatki"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Kierunek przekazywania"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Rozmiar komponentu wg siatki"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" jest parametrem tylko do odczytu, \"out\" jest parametrem tylko do "
-"zapisu, a\"inout\" jest parametrem do zapisu i odczytu."
+"Wielkość komponentu wg siatki będzie wielokrotnością odstępu siatki.\n"
+"Jeśli włączone jest przyciąganie do siatki, komponent będzie zawsze "
+"wyrównywany do siatki."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generowanie"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Odstęp siatki:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Koniec"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kod wygenerowany"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Kod nie wygenerowany"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Szerokość linii:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Kod jeszcze nie wygenerowany"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Eksportuj wszystkie widoki"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Katalog %1 nie istnieje. Czy chcesz go teraz stworzyć?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Katalog do zapisu diagramów:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Katalog wyjściowy nie istnieje"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Katalog bazowy do zapisu obrazków"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Utwórz folder"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Typ &obrazka:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Nie generuj pliku"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Użyj &katalogów"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Nie można utworzyć katalogu.\n"
-"Upewnij się czy masz prawo zapisu do katalogu nadrzędnego lub wybierz inny, "
-"poprawny, katalog."
+"Tworzy w katalogu docelowym taką samą strukturę drzewiastą, jaka była "
+"używana w dokumencie do przechowywania widoków"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Błąd podczas tworzenia katalogu."
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Wybierz poprawny katalog."
-
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Katalog wyjściowy istnieje, ale nie można do niego zapisywać.\n"
-"Ustaw właściwe uprawnienia lub wybierz inny katalog."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Błąd w zapisie do katalogu wyjściowego"
+"Widoki są przechowywane w dokumencie w folderach. Ta opcja powoduje "
+"stworzenie takiej samej struktury drzewiastej w wybranym katalogu bazowym.\n"
+"Tylko foldery stworzone przez użytkownika są tworzone w katalogu bazowym "
+"(widoki logiczne, widoki przypadków użycia, itp. nie są stworzone)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 nie wydaje się być katalogiem. Proszę wybrać poprawny katalog."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Zmienność roli"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Proszę wybrać poprawny katalog"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Widoczność roli"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Docelowy plik już istnieje"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Eksportuj"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Plik %1 już istnieje w %2.\n"
-"\n"
-"Umbrello może zastąpić plik, wygenerować podobną\n"
-"nazwę pliku lub nie generować tego pliku."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Przypisz do pozostałych plików"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Zastąp"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generuj podobną nazwę pliku"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Nie generuj pliku"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Opcje niedostępne.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Liczebność"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Podaj liczebność:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nazwa powiązania"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Podaj nazwę powiązania:"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nazwa roli"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Podaj nazwę roli:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Podaj nazwę operacji:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Wprowadź nowy tekst:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "BŁĄD"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Zmiana tekstu"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Wyrównaj do lewej"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Wyrównaj do prawej"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Wyrównaj do góry"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Wyrównaj do dołu"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nowy"
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr "Wyrównaj do środka w pionie"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "P&okaż"
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr "Wyrównaj do środka w poziomie"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Powiększenie:"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr "Wyrównaj pionowo z rozprowadzeniem"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kod"
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
-msgstr "Wyrównaj poziomo z rozprowadzeniem"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktywny &język"
 
-#: aligntoolbar.cpp:383
+#: tips:3
+#, fuzzy
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Do wyrównywania musisz wybrać co najmniej 2 obiekty takie jak klasy lub "
-"aktorzy. Nie możesz wyrównywać powiązań."
-
-#: object_factory.cpp:164
-msgid "This is a reserved keyword for the language of the configured code generator."
-msgstr "To jest zastrzeżone słowo kluczowe dla języka ustawionego generatora kodu."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Zastrzeżone słowo kluczowe"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Eksportowanie widoku..."
-
-#: umlviewimageexporter.cpp:50
-msgid "An error happened when exporting the image:\n"
-msgstr "Podczas eksportowania obrazka wystąpił błąd:\n"
+"<p>Witaj w Umbrello.</p>\n"
+"<p>Diagramy UML pozwolą Ci zaprojektować i udokumentować oprogramowanie "
+"obiektowe.  Bardzo dobrym wstępem do użytkowania UML jest  <a href=\"help:/"
+"umbrello\">Podręcznik Umbrello</a>.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:11
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Plik %1 już istnieje.\n"
-"Zastąpić go?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Plik już istnieje"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nowy_aktor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nowy_przypadek_użycia"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nowy_pakiet"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nowy_komponent"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nowy_węzeł"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nowy_artefakt"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nowy_interfejs"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nowy_typ_danych"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nowe_wyliczenie"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nowe_encja"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nowy_folder"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nowy_obiekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Pusty"
+"<p>Witamy w Umbrello 1.5. W tej wersji nowe funkcje to między innymi: klasy "
+"asocjacyjne, generowanie kodu Ruby, zewnętrzne katalogi i możliwość zmiany "
+"interfejsu w klasach.</p>\n"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Błędnie sformułowany argument"
+#: 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 ""
+"<p>Diagramy z zakładkami i zewnętrzne katalogi wzajemnie się wykluczają. "
+"Jeśli potrzebujesz zewnętrznych katalogów, wyłącz opcję &quot;Użyj diagramów "
+"z zakładkami&quot; w Ustawieniach ogólnych.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Nieznany typ argumentu"
+#: 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 ""
+"<p>Wielkość większości elementów diagramu nie może być zmieniana. Jest ona "
+"dostosowywana do ich zawartości.\n"
+"Wielkości pudełek, notatek i sekwencji komunikatów diagramów mogą być "
+"zmieniane przez kliknięcie i przeciągnięcie czerwonego kwadratu.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Niewłaściwa nazwa metody"
+#: 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 ""
+"<p>Jeśli chcesz dodać istniejącą klasę do diagramu, wystarczy przeciągnąć ją "
+"z perspektywy drzewiastej.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Zwrócony typ nieznany"
+#: 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 ""
+"<p>Agent refaktoringu pozwala przemieszczać operacje pomiędzy klasą, jej "
+"pochodnymi i klasą bazową.\n"
+"Kliknij prawym przyciskiem myszki na klasie aby uruchomić agenta "
+"refaktoringu.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Nieokreślony błąd"
+#: 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 ""
+"<p>Obiekty diagramu sekwencji mogą mieć pudełko destruktora i mogą być "
+"wykreślane jako aktorzy. Podwójne kliknięcie na którymś\n"
+"otworzy okno dialogowe Własności.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Dodanie klasy bazowej"
+#: 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 ""
+"<p>Komunikaty diagramu sekwencji mogą zachowywać się jak konstruktorzy. "
+"Kliknij na pudełku obiektu (a nie na pionową linie) aby uczynić go "
+"konstruktorem.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Dodanie klasy pochodnej"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Diagramy sekwencji obsługują komunikaty do samych siebie. Kliknij "
+"ponownie na tę samą pionową linię aby utworzyć komunikat automatyczny.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Dodanie operacji"
+#: 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 ""
+"<p>Jeśli przy wczytywaniu zewnętrznego pliku nic nie wyświetla się w widoku "
+"list spróbuj zapisać model pod inną nazwą,\n"
+"następnie zamknąć i ponownie wczytać zapisany plik. Z reguły widok list "
+"zostaje poprawnie wypełniony.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Dodanie atrybutu"
+#: 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 ""
+"<p>Operacje Wytnij i Kopiuj mogą również umieszczać obrazki w schowku PNG, "
+"dzięki czemu mogą być one wklejane do programu KWord\n"
+"i innych programów.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Dodanie interfejsu bazowego"
+#: 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 ""
+"<p>Powiązania nie muszą być w liniach prostych. Podwójne kliknięcie na "
+"którymś powiązaniu utworzy przesuwalny punkt.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Dodanie interfejsu pochodnego"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>W ustawieniach Umbrello można włączyć automatyczny zapis projektu.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Klasyfikatory bazowe"
+#: 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 ""
+"<p>Czy brak jakiejś potrzebnej cechy w Umbrello? Daj nam znać. \n"
+"Informacja może być podana za pomocą narzędzia Raport o błędzie (menu "
+"Pomoc)\n"
+"lub wysłana na listę dyskusyjną UML Devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Klasyfikatory pochodne"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Wszystkie zaznaczone obiekty mogą być usunięte za pomocą Del lub "
+"Backspace.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Nie można utworzyć katalogu: %1"
+#: 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 ""
+"<p>Jeżeli znalazłeś błąd w Umbrello - daj nam znać. \n"
+"Błędy można przekazywać za pomocą narzędzia Raport o błędzie w menu Pomoc.</"
+"p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Nie można zapisać pustego diagramu"
+#: 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 ""
+"<p>Wciśnięcie Esc powoduje zmianę bieżącego narzędzia na narzędzie wyboru.\n"
+"Backspace powoduje uaktywnienie uprzednio wykorzystywanego narzędzia.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Wystąpił błąd podczas zapisywania diagramu do %1"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p> Wszystkie obiekty można wybrać za pomocą Ctrl-A.</p>\n"
 
+#: tips:127
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
+msgstr ""
+"<p>Można utworzyć i skonfigurować nową klasę za pomocą Asystenta nowej klasy "
+"w menu Kod.</p>\n"
diff --git a/tde-i18n-pt/messages/tdesdk/umbrello.po b/tde-i18n-pt/messages/tdesdk/umbrello.po
index 3490cda833b..a6dd903b39f 100644
--- a/tde-i18n-pt/messages/tdesdk/umbrello.po
+++ b/tde-i18n-pt/messages/tdesdk/umbrello.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-08-29 15:59+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -31,248 +31,208 @@ msgstr ""
 "X-POFile-SpellExtra: novoobjecto novaassociação Hensgen estereótipo\n"
 "X-POFile-SpellExtra: novoenumerado inline aka inout Gael\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Gerador autónomo de código do Modelador de UML Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "O ficheiro a transformar"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "O ficheiro XSLT a usar"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Autores do Modelador de "
-"UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autores do Modelador de UML Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "José Nuno Pires,Pedro Morais"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "A exportar todas as vistas..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "jncp@netcabo.pt,morais@kde.org"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Ocorreram alguns erros ao exportar as imagens:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Indique o Nome da Actividade"
 
-#: 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 "Ocorreu um problema ao gravar o ficheiro: %1"
+#: 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 "Insira o nome da nova actividade:"
 
-#: 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 "Erro de Gravação"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Alinhar à Esquerda"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objecto"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Alinhar à Direita"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Mensagem Síncrona"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Alinhar ao Topo"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Mensagem Assíncrona"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alinhar ao Fundo"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Associação"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Alinhar o Centro na Vertical"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Contido"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Alinhar o Centro na Horizontal"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Âncora"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Distribuição Alinhada na Vertical"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Legenda"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Distribuição Alinhada na Horizontal"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Nota"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Para o alinhamento, você terá de seleccionar pelo menos 2 objectos, como por "
+"exemplo classes ou acções. Não poderá alinhar associações."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Caixa"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatação"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Actor"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dependência"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalização"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregação"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relação"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Associação Direccional"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementa (Generalização/Realização)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composição"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Caso de Utilização"
-
-#. 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 "Classe"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Estado Inicial"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Estado Final"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Ramificação/Junção"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Ramificar/Juntar"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pacote"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Componente"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nó"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dependência"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefacto"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Associação"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interface"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Auto-Associação"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tipo de Dados"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Mensagem de Colaboração"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumerado"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Mensagem de Sequência"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entidade"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Auto-mensagem de Colaboração"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Histórico Profundo"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Auto-mensagem de Sequência"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Histórico Lato"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Contido"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Juntar"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composição"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Ramificar"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realização"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Junção"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Associação Unidireccional"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Escolha"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Âncora"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Transição de Estados"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Transição de Actividade"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Actividade"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Estado"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicidade"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Actividade Final"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Indique a multiplicidade:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Actividade Inicial"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nome da Associação"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mensagem"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Indique o nome da associação:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "INDEFINIDO"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nome do Papel"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Selecção"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Indique o nome do papel:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Já existe uma operação com esse nome  assinatura. Não pode adicioná-la "
+"novamente."
+
+#: 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 "Esse nome é inválido."
+
+#: 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 "Nome Inválido"
+
+#: 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 "Esse nome já está a ser usado."
+
+#: 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 "Não é um Nome Único"
 
 #: 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."
+"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 ""
-"Pelo menos um dos itens da área de transferência não pôde ser colado porque já "
-"existe um item com o mesmo nome. Todos os outros itens foram colados."
+"Pelo menos um dos itens da área de transferência não pôde ser colado porque "
+"já existe um item com o mesmo nome. Todos os outros itens foram colados."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -283,18 +243,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Não é possível aceder ao ficheiro %1 para escrita. Certifique-se por favor que "
-"a pasta existe e que tem permissões de escrita nela."
+"Não é possível aceder ao ficheiro %1 para escrita. Certifique-se por favor "
+"que a pasta existe e que tem permissões de escrita nela."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Não É Possível Aceder ao Ficheiro"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Não é possível criar a pasta:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Não é possível criar a pasta:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -308,1359 +266,1520 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Não é Possível Criar a Pasta"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Indicar o Nome do Estado"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Opções Gerais"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Indique o nome do novo estado:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Pacote é um espaço de nomes"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Inserir Actividade"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Destrutores virtuais"
 
-#: 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 "Insira o nome da nova actividade:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Gerar construtores vazios"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nova actividade"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Geral métodos acessores"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Modelo UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operações são 'inline'"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Vista Lógica"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Acessores são 'inline'"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Vista dos Casos de Utilização"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Acessores são públicos"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Vista de Componentes"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "A importar o ficheiro: %1 Progresso: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Vista de Entrada em Produção"
+#: 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 "Pronto."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model Entidade Relação"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "O âmbito %1 é um espaço de nomes ou uma classe?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipos de dados"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Importação C++ Pede a Sua Ajuda"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"O ficheiro actual foi modificado.\n"
-"Deseja gravá-lo?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Espaço de nomes"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "O ficheiro %1 não existe."
+#: 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 "Classe"
 
-#: 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 "Erro de Leitura"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Erro Interno"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "O ficheiro %1 parece estar corrompido."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Erro de sintaxe antes do '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Não existia nenhum ficheiro XMI no ficheiro comprimido %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Erro de Análise Antes do '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Ocorreu um problema ao ler o ficheiro extraído: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Ocorreu um problema ao ler o ficheiro: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "é esperada uma expressão"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Ocorreu um problema ao enviar o ficheiro: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Erro de sintaxe da declaração"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagrama de casos de utilização"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "É esperado um }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagrama de classe"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "É esperado um 'namespace'"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagrama de sequência"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "É esperado um {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagrama de colaboração"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "É esperado o nome de um 'namespace'"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagrama de estado"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "É necessário declarar um indicador do tipo"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagrama de actividade"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "É esperada uma declaração"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagrama de componentes"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "É esperada uma expressão constante"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagrama de entrada em produção"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "É esperado um ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagrama entidade relação"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "Falta um }"
 
-#: 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 "Nome"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Esperavam-se os inicializadores do membro"
 
-#: 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 "Indique o nome:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "É esperada a indicação da classe de base"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Esse é um nome inválido para um diagrama."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "É esperada uma instrução de inicialização"
 
-#: 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 "Nome Inválido"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "É esperado um identificador"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Já existe um diagrama com esse nome."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "É esperado o ID do tipo"
 
-#: 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 "Não é um Nome Único"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "É esperado o nome da classe"
 
-#: 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 "Esse nome é inválido."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "É esperada uma condição"
 
-#: 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 "Esse nome já está a ser usado."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "É esperada uma instrução"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"O nome que indicou não era único.\n"
-"É isto o que deseja?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "É esperada a inicialização do 'for'"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nome Não Único"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "É esperado um 'catch'"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Nome da Utilização"
+#: 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 "&Propriedades"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Indique o Novo Nome"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Actividade inicial"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Tem a certeza que deseja remover o diagrama %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Actividade final"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Remover o Diagrama"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Ramificação/Junção"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "A configurar o documento..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Ramificar/Juntar"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "A resolver as referências a objectos..."
+#: 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 "Geral"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "A carregar os elementos de UML..."
+#: 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 "Propriedades Gerais"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "A carregar os diagramas..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tipo da actividade:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Diagrama-uml-kde"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nome da actividade:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autogravar%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 "Documentação"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Exteriorizar a Pasta"
+#: 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 "Tipo de letra:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Indicar o Nome do Modelo"
+#: 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 "Configuração dos Tipos de Letra"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Insira o novo nome do modelo:"
+#: 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 "Cor"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vistas"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Cores dos Elementos"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"O nome que indicou era inválido.\n"
-"O processo de criação foi cancelado."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Actividades"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nome Inválido"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nova Actividade..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"O nome que indicou não era único!\n"
-"O processo de criação foi cancelado."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Remover a Âncora..."
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Criação cancelada"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Mudar o Nome"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "A carregar a vista em lista..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nova Actividade"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "A pasta deve estar vazia antes de poder ser apagada."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nova actividade"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Pasta Não Vazia"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Mudar o Nome da Actividade"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Já existe uma operação com esse nome  assinatura. Não pode adicioná-la "
-"novamente."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Insira o novo nome da actividade:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Indique o Nome da Actividade"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "novo estado"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipo:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalização"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associações"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Auto-Associação"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Propriedades da Associação"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Mensagem de Colaboração"
+#: 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 "Configuração Geral"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Mensagem de Sequência"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Papeis"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Auto-mensagem de Colaboração"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Configuração dos Papéis"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Auto-mensagem de Sequência"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Tipo de letra da associação"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realização"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Propriedades do Papel A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Associação Unidireccional"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Propriedades do Papel B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportar"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Visibilidade do Papel A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagrama"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Visibilidade do Papel B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Novo"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Morfologia do Papel A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "M&ostrar"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Morfologia do Papel B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Código"
+msgid "Rolename:"
+msgstr "Nome do papel:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Linguagem Activa"
+msgid "Multiplicity:"
+msgstr "Multiplicidade:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentação"
+msgid "Public"
+msgstr "Público"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Barra-Barra (//)"
+msgid "Private"
+msgstr "Privado"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Barra-Estrela (/**  */)"
+msgid "Protected"
+msgstr "Protegido"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Estilo:"
+msgid "Implementation"
+msgstr "Implementação"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Geração de Código C++</p>"
+msgid "Changeable"
+msgstr "Modificável"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Geral"
+msgid "Frozen"
+msgstr "Congelado"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Geração do Corpo dos Métodos"
+msgid "Add only"
+msgstr "Adicionar apenas"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Utilizar as seguintes classes no código gerado:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nome da classe:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nome do actor:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nome do pacote:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variável</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nome do caso de utilização:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nome da interface:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nome do componente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nome do artefacto:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Nome do enumerado:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nome do tipo de dados:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nome da entidade:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Nome do e&stereótipo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Nome do &pacote:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nome da classe"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Classe a&bstracta"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Ficheiro de inclusão</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Caso de uso a&bstracto"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Geração do Projecto"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Executável"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Cria um novo documento ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Desenhar Como"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Auto-Gerar Métodos"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Predefinição"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Métodos construtores vazios"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Preenc&himento:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Métodos acessores de associações"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&lioteca"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Métodos acessores de atributos"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabela"
 
-#. 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 "Público"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibilidade"
 
-#. 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 "Privado"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&úblico"
 
-#. 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 "Protegido"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivado"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Do Objecto Pai"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tegido"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Âmbito por omissão dos acessores de atributos:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentação"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Âmbito por omissão dos campos de associação:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nome da classe:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Do Papel Pai"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nome da instância:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Geração de Código Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Desenhar como actor"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Cardinal (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Instância múltipla"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Início-Fim (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Mostrar a destruição"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Geração de Código em Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nome do componente:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nome do nó:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nome do estereótipo:"
+
+#: 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 ""
+"O nome que escolheu\n"
+"já está a ser usado.\n"
+"O nome foi reinicializado."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "O Nome Não é Único"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributos"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ovo Atributo..."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operações"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nova Op&eração..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Modelos"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Novo Mod&elo..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Literais Enumerados"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Novo Lit&eral Enumerado..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributos da Entidade"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Novo Atributo da &Entidade..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Remover a Âncora..."
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Propriedades"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Mostrar"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operaçõ&es"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibilidade"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Assinatura das o&perações"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&cote"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributos"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Estereót&ipo"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Assinatura dos atr&ibutos"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Desenhar como um circulo"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Visualização"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opções de Visualização"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Configuração dos Atributos"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Configuração da Operação"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Configuração do Modelo"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Configuração dos Literais Enumerados"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Configuração de Atributos da Entidade"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Contido"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Configuração dos Conteúdos"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Associações da Classe"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_classe"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nova Classe"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributos da Classe"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operações da Classe"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Opções de Geração de Código"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Linguagem"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Gerar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Pastas"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Terminar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Criar todos os ficheiros gerados na pasta:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Código Gerado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Escolher..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Não Gerado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Es&colher..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ainda Não Gerado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Incluir os ficheiros da pasta:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "A pasta %1 não existe. Deseja criá-la agora?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Os ficheiros criados com o Gerador de Código serão colocados nesta pasta"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "A Pasta de Saída Não Existe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Criar uma Pasta"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Não Criar"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Os ficheiros nesta pasta serão usados como ficheiros de inclusão para o código "
-"gerado"
+"Não foi possível criar a pasta.\n"
+"Verifique que tem acesso de escrita à pasta que a contém ou seleccione uma "
+"pasta válida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Política de Sobreposição"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Erro ao Criar Pasta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Por favor seleccione uma pasta válida."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Se já existir um ficheiro com o mesmo nome que\n"
-"um dos que o gerador de código pretender usar:"
+"A pasta de saída já existe, mas não é possível escrever nela.\n"
+"Por favor modifique as permissões ou escolha outra pasta."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "S&obrepor"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Erro ao Escrever para Pasta de Saída"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Sobrepor os ficheiros já existente se estiverem na pasta de destino"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "O %1 não parece ser uma pasta. Por favor escolha uma pasta válida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Per&guntar"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Por Favor Escolha uma Pasta Válida"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Se já existir um ficheiro com o mesmo nome, pergunta o que deve fazer"
+msgid "Code Viewer"
+msgstr "Visualizador de Código"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Usar um nome diferente"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nenhuma Opção Disponível.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Se já existir um ficheiro na pasta de destino, seleccionar um nome diferente a "
-"usar adicionando um sufixo ao nome do ficheiro"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatação"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linhas"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Diagrama a&ctual"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Estilo de fim de linha:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "Todos os di&agramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Tipo de indentação:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Seleccionar os diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Tamanho da indentação:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tipo de diagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Selecção"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Caso de Utilização"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Colaboração"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Sem Indentação"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sequência"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulação"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Estado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Espaço"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Componente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Verbosidade dos Comentários"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Entrada em Produção"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Diagrama-uml-kde"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Não está seleccionado nenhum diagrama."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "O formato para o qual serão exportadas as imagens"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Documentação de Notas"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "O Ficheiro de Destino Já Existe"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Escrever os comentários para as &secções \n"
-"mesmo que estas estejam vazias"
+"O ficheiro %1 já existe em %2.\n"
+"\n"
+"O Umbrello pode sobrepor o ficheiro, gerar um nome\n"
+"semelhante ou não gerar este ficheiro."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Aplicar para todos os outros ficheiros"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "S&obrepor"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Gerar um Nome de Ficheiro Semelhante"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Não Gerar o Ficheiro"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Propriedades do Parâmetro"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipo:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nome:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Valor &inicial:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Direcção de Passagem"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Escrever os comentários para indicar as diferentes secções ('public', "
-"'private', etc...) numa classe, mesmo que estas estejam vazias"
+"\"in\" é um parâmetro apenas de leitura, \"out\" é um parâmetro apenas de "
+"escrita e \"inout\" é um parâmetro de leitura e escrita."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Escre&ver os comentários de documentação mesmo que vazios"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Itens Contidos"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Escrever os comentários de documentação para as classes e &métodos mesmo que "
-"estes estejam vazios"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Seleccionar a Operação"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Opções da Linguagem"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Número de sequência:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Assistente de Geração de Código"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operação da classe:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Seleccionar as Classes"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Operação personalizada:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Configuração do Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interface do Utilizador"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Configuração da Interface do Utilizador"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Cor da linha:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Cor Pr&edefinida"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Cor de preenchimento:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "&Cor Predefinida"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Largura da linha:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Largura por O&missão"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Usar a cor de preenchimento"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Coloque todas as classes para as quais pretende\n"
-"gerar código na lista do lado direito"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Adicionar a classe para a geração de código"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Activar o desfazer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Classes Seleccionadas"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Utilizar diagramas paginados"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Remover a classe da geração de código"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Utilizar os novos geradores C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Classes Disponíveis"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Âmbito por omissão dos campos de associação:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Estado da Geração de Código"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Gravação Automática"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Carregue no botão Geração para iniciar a geração de código"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Activar a &gravação automática"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Estado da Geração"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Seleccione o intervalo entre gravações automáticas (min):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Visualizador de Código"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Sufixo das gravações automáticas:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Mostrar os blocos escondidos"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>O ficheiro de gravação automática será gravado em ~/autosave.xmi, se "
+"a gravação automática ocorrer antes de ter gravado manualmente o ficheiro.</"
+"p><p>Se já o tiver gravado, o ficheiro de gravação automática será gravado "
+"na mesma pasta que o ficheiro e terá o mesmo nome que este, seguido do "
+"sufixo indicado.</p><p>Se o sufixo for igual ao sufixo do ficheiro que "
+"gravou, a gravação automática irá sobrepor automaticamente o seu ficheiro.</"
+"p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">nome do componente aqui</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Arranque"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Mostrar o tipo do bloco"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logótipo &inicial"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Cores"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Dica do dia"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Tipo de letra:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Carregar o ú&ltimo projecto"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papel:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Iniciar um novo projecto com:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Seleccionado:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Nenhum Diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Bloco de objecto UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagrama de Classes"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Bloco escondido:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagrama de Casos de Utilização"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"center\">Texto não editável:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagrama de Sequência"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Texto editável:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagrama de Colaboração"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Propriedades do Diagrama"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagrama de Estados"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nome:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagrama de Actividades"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Ampliação:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagrama de Componentes"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagrama de Entrada em Produção"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Configuração da Classe"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Mostrar a &visibilidade"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Mostrar os atributos"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Mostrar as operações"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Mostrar o estereó&tipo"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Mostrar a assinatura dos atributos"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Mostrar o pacote"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Mostrar a assinatura das operações"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Mostrar a &grelha"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Âmbito Inicial"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Ajus&tar à grelha"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Âmbito por omissão dos atributos:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Ajustar tamanho dos componentes"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Âmbito por omissão das operações:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Geração de Código"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Configuração da Geração de Código"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Configuração do Visualizador de Código"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Estado inicial"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Estado final"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tipo do estado:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nome do estado:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Cor do Elemento"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Propriedades do Atributo"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Âmbito do cla&ssificador (\"static\")"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Público"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&egido"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementação"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "O utilizador indicou um nome de atributo inválido."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nome do Atributo Inválido"
+
+#: dialogs/umlattributedialog.cpp:163
 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 ""
-"Ajusta o tamanho dos componentes para um múltiplo do espaçamento da grelha.\n"
-"Se 'Ajustar à Grelha' estiver activo os componentes ficarão sempre alinhados "
-"com a grelha em todos os 4 lados."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "O nome do atributo que escolheu já está a ser usado nesta operação."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Espaçamento da grelha:  "
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Nome do Atributo Não-Único"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Propriedades do Atributo da Entidade"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Valor por omissão:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Largura da linha:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Tamanho/Valores:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exportar todas as vistas"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "Incremento &automático"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "Pasta on&de gravar os diagramas:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Permitir &nulo"
 
-#. 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"
-msgstr "A pasta de base usada para gravar as imagens"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributos:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Tipo de &imagem:"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexação"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "O formato para o qual serão exportadas as imagens"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Nenhum"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Usar &pastas"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primário"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Índ&ice"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Único"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Indicou um nome de atributo de entidade inválido."
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nome do Atributo de Entidade Inválido"
+
+#: 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 ""
-"Cria na pasta de destino a mesma estrutura em árvore usada\n"
-"no documento para gravar as vistas"
+"O nome do atributo da entidade que escolheu já está a ser usado nesta "
+"operação."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Nome do Atributo da Entidade Não Único"
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Propriedades da Operação"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Operação &abstracta"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "Pes&quisa (\"const\")"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parâmetros"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&vo Parâmetro..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "O utilizador indicou um nome de parâmetro inválido."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nome do Parâmetro Inválido"
+
+#: 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 ""
-"As vistas são gravadas em pastas do documento. É usada a mesma estrutura em "
-"árvore, usada no documento, para gravar as vistas na pasta de base "
-"seleccionada, se activar esta opção.\n"
-"Só as pastas criadas pelo utilizador é que serão criadas na pasta de base (a "
-"vista lógica, a vista de casos de uso e as outras não são criadas)."
+"O nome do parâmetro que escolheu\n"
+"já está a ser usado nesta operação."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Nome do Parâmetro Não-Único"
+
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "O nome do parâmetro que escolheu já está a ser usado nesta operação."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "O utilizador indicou um nome de operação inválido."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nome de Operação Inválido"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Já existe uma operação com essa assinatura em %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Escolha um nome ou lista de parâmetros diferente."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "Propriedades do Papel"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Nome do papel:"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Propriedades do Modelo"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicidade:"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Foi indicado um nome de modelo inválido."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Morfologia do Papel"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nome do Modelo Inválido"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Adicionar apenas"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "O nome do modelo que escolheu já está a ser usado nesta operação."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Congelado"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Nome do Modelo Não-Único"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Modificável"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opções de Visualização das Classes"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Visibilidade do Papel"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Cores dos Diagramas"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementação"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "O nome que inseriu é inválido."
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Bem-vindo ao Umbrello.</p>\n"
-"<p>Os diagramas em UML permitem-lhe desenhar e documentar o 'software' "
-"orientado por objectos.  <a href=\"help:/umbrello\">O Manual do Umbrello</a> "
-"é uma boa introdução ao uso do UML.</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "O nome que indicou não é único."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Bem-vindo ao Umbrello 1.5.  As novidades desta versão são as classes de "
-"associação, a geração de código em Ruby, a exteriorização de pastas, a "
-"capacidade de mudar interfaces para classes, entre outras novidades.</p>\n"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nome Não Único"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Os Diagramas em Páginas e as Pastas Exteriorizadas são mutuamente "
-"exclusivos. Se necessita de Pastas Externas, desligue então a opção &quot;Usar "
-"diagramas em páginas&quot; na Configuração Geral.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linha:"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>A maioria dos itens dos diagramas não podem ser redimensionados; eles irão "
-"mudar o seu tamanho para se ajustar ao seu conteúdo.\n"
-"As caixas, notas e mensagens dos diagramas de sequência poderão ser "
-"redimensionados, bastando para tal carregar e arrastar o quadrado vermelho.</p>"
-"\n"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Preenc&himento:"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Se quiser adicionar uma classe já existente a um diagrama, basta arrastar o "
-"seu item da janela da árvore.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Pr&edefinição"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>O agente de refactoração do Umbrello permite-lhe mover as operações entre "
-"uma classe e as suas classes derivadas ou de base.\n"
-"Carregue com o botão direito numa classe para abrir o agente de "
-"refactoração.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Usar o preenchimento"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Os objectos dos diagramas de sequência podem ter uma opção de destruição e "
-"podem ser desenhados como autores. Faça duplo-click para \n"
-"a janela de Propriedades.</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "A exportar todas as vistas..."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>As mensagens dos diagramas de sequência podem actuar como construtores. "
-"Carregue na caixa do objecto (em vez da linha vertical) para o tornar um "
-"construtor.</p>\n"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Ocorreram alguns erros ao exportar as imagens:"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Os diagramas de sequência suportam mensagens para si próprios. Carregue de "
-"novo na mesma linha vertical para criar uma mensagem automática.</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 "Ocorreu um problema ao gravar o ficheiro: %1"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Se, no carregamento de um ficheiro legado, não for mostrado nada na lista, "
-"tente gravar o modelo com outro nome,\n"
-"fechá-lo e voltar a carregar o ficheiro gravado. Normalmente, neste caso, a "
-"lista será então preenchida correctamente.\n"
-"</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 "Erro de Gravação"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>O Cortar e o Colar também irão exportar a imagem para uma área de "
-"transferência de PNG a qual poderá ser colada no KWord e em outras "
-"aplicações.</p>\n"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Gerador autónomo de código do Modelador de UML Umbrello"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>As associações não tem de ser linhas direitas, se carregar duas vezes numa, "
-"irá criar um ponto móvel.</p>\n"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "O ficheiro a transformar"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Pode activar a gravação automática na janela Configurar o Umbrello.</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "O ficheiro XSLT a usar"
 
-#: 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 ""
-"<p>Existe alguma funcionalidade em falta que precise no Umbrello? Diga-nos qual "
-"é.\n"
-"Adicione-a à base de dados de erros com o Comunicar um Erro no menu de Ajuda ou "
-"envie-o para a lista de correio do uml-devel.</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 Autores do Modelador "
+"de UML Umbrello"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Pode remover todos os objectos seleccionados ao carregar em Del ou "
-"Backspace.</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autores do Modelador de UML Umbrello"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Se descobriu um erro no Umbrello, indique-nos.\n"
-"Pode submeter os erros com a ferramenta de Comunicar um Erro no menu de "
-"Ajuda.</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 "Nome"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Se carregar na tecla Escape escolhe a ferramenta actual como sendo a de "
-"selecção.\n"
-"O Backspace salta para a ferramenta usada anteriormente.</p>\n"
+#: 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 "Indique o nome:"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Pode seleccionar todos os objectos ao carregar em Ctrl-A.</p>\n"
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Indique o nome da operação:"
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Pode criar e configurar uma nova classe usando o Assistente de Novas Classes "
-"no menu Código.</p>\n"
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Insira o novo texto:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERRO"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Mudar o Texto"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "O ficheiro da pasta %1 não existe."
+
+#: 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 "Erro de Leitura"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "O ficheiro da pasta %1 não consegue ser aberto."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1714,6 +1833,10 @@ msgstr "Nova Operação..."
 msgid "Select Operation..."
 msgstr "Seleccione a Operação..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Mudar o Texto..."
@@ -1765,6 +1888,19 @@ msgstr "Novo"
 msgid "Rename..."
 msgstr "Mudar o Nome..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Erro de Colagem"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Cor da Linha..."
@@ -1793,14 +1929,26 @@ msgstr "Interiorizar a Pasta"
 msgid "Import Classes..."
 msgstr "Importar Classes..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pacote"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Sub-Sistema"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefacto"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagrama de Componentes..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nó"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagrama de Entrada em Produção..."
@@ -1809,10 +1957,18 @@ msgstr "Diagrama de Entrada em Produção..."
 msgid "Folder"
 msgstr "Pasta"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entidade"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagrama de Relação entre Entidades..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Actor"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagrama de Casos de Utilização..."
@@ -1849,6 +2005,18 @@ msgstr "Novo Atributo da Entidade..."
 msgid "Export as Picture..."
 msgstr "Exportar Como Uma Imagem..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interface"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tipo de Dados"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumerado"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagrama de Classes..."
@@ -1869,26 +2037,10 @@ msgstr "Diagrama de Sequência..."
 msgid "Collaboration Diagram..."
 msgstr "Diagrama de Colaboração..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributos"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operações"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Apenas Público"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibilidade"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Assinatura da Operação"
@@ -1901,11 +2053,6 @@ msgstr "Assinatura do Atributo"
 msgid "Stereotype"
 msgstr "Estereótipo"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Mostrar"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atributo..."
@@ -1930,14 +2077,6 @@ msgstr "Cor de Preenchimento..."
 msgid "Use Fill Color"
 msgstr "Usar a Cor de Preenchimento"
 
-#: 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 "Cor"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Actor..."
@@ -1966,10 +2105,26 @@ msgstr "Enumerado..."
 msgid "Package..."
 msgstr "Pacote..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Estado Inicial"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Estado Final"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Estado..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Actividade Inicial"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Actividade Final"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Sub-Sistema..."
@@ -2014,6 +2169,14 @@ msgstr "Remover a Âncora..."
 msgid "Change Association Name..."
 msgstr "Mudar o Nome da Associação..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Limpar o Diagrama"
@@ -2048,202 +2211,107 @@ msgstr "a pasta do ficheiro"
 
 #: 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 ""
-"manter a estrutura em árvore usada para guardar as vistas do documento na pasta "
-"de destino"
+"manter a estrutura em árvore usada para guardar as vistas do documento na "
+"pasta de destino"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 Autores do Modelador de UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Utilização incorrecta das associações."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Erro de Associação"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "O ficheiro da pasta %1 não existe."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "O ficheiro da pasta %1 não consegue ser aberto."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "José Nuno Pires,Pedro Morais"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "jncp@netcabo.pt,morais@kde.org"
-
-#: 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 "Pronto."
-
-#: 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 ""
-"Carregue no Shift ou Ctrl para se mover no eixo dos X. Carregue o Shift e o "
-"Ctrl ao mesmo tempo para se mover no eixo dos Y. Carregue com o botão direito "
-"para cancelar o movimento."
-
-#: 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 ""
-"Carregue no Shift ou Ctrl para se mover no eixo dos X. Carregue o Shift e o "
-"Ctrl ao mesmo tempo para se mover no eixo dos Y. Carregue com o botão direito "
-"para cancelar o dimensionamento."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "O âmbito %1 é um espaço de nomes ou uma classe?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Importação C++ Pede a Sua Ajuda"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Espaço de nomes"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "A importar o ficheiro: %1 Progresso: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Erro Interno"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Erro de sintaxe antes do '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Erro de Análise Antes do '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "novo_actor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "é esperada uma expressão"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "novo_casodeutilização"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Erro de sintaxe da declaração"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "novo_pacote"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "É esperado um }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nova_componente"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "É esperado um 'namespace'"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "novo_nó"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "É esperado um {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "novo_artefacto"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "É esperado o nome de um 'namespace'"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nova_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "É necessário declarar um indicador do tipo"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "novo_tipodedados"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "É esperada uma declaração"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "novo_enumerado"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "É esperada uma expressão constante"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nova_entidade"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "É esperado um ')'"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nova_pasta"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "Falta um }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nova_associação"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Esperavam-se os inicializadores do membro"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "novo_objecto"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "É esperada a indicação da classe de base"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "É esperada uma instrução de inicialização"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Vazio"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "É esperado um identificador"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argumento mal formado"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "É esperado o ID do tipo"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tipo de argumento desconhecido"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "É esperado o nome da classe"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nome de método ilegal"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "É esperada uma condição"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tipo de retorno desconhecido"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "É esperada uma instrução"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "O erro não é conhecido"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "É esperada a inicialização do 'for'"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Esta palavra-chave está reservada na linguagem do gerador de código "
+"configurado."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "É esperado um 'catch'"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Palavra-chave Reservada"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2257,106 +2325,66 @@ msgstr "Indique o nome do objecto:"
 msgid "new_parameter"
 msgstr "novo_parâmetro"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Opções Gerais"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Pacote é um espaço de nomes"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Destrutores virtuais"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Gerar construtores vazios"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Geral métodos acessores"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operações são 'inline'"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Acessores são 'inline'"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Acessores são públicos"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagrama: %2 Página %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Indicar o Nome do Diagram"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Adicionar uma Classe Base"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Insira o novo nome do diagrama:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Adicionar uma Classe Derivada"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Está prestes a remover o diagrama inteiro.\n"
-"Tem a certeza?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Adicionar uma Operação"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Remover o Diagrama?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Adicionar um Atributo"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Mudança de nome cancelada"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Adicionar uma Interface Base"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Mudar o nome de item no tipo de vista em lista %1 ainda não está implementado."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Adicionar uma Interface Derivada"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Função Não Implementada"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Classificadores Base"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"O nome que indicou é inválido.\n"
-"O processo de mudança de nome foi cancelado."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Classificadores Derivados"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nova_associação"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Indicar o Nome do Estado"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "novo_atributo"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Indique o nome do novo estado:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novo_modelo"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Inserir Actividade"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operação"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Utilização incorrecta das associações."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "novo_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Erro de Associação"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_campo"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "novo estado"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2510,11 +2538,6 @@ msgstr "&Exportar Como Uma Imagem..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Export&ar Todos os Diagramas como Imagens..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Propriedades"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Barra de A&mpliação"
@@ -2599,21 +2622,28 @@ msgstr "&Documentação"
 msgid "Opening file..."
 msgstr "A abrir o ficheiro..."
 
+#: 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 "A criar um novo documento..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Todos os Ficheiros Suportados (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Todos os Ficheiros Suportados (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2)\n"
 "*.xmi|Ficheiros XMI Comprimidos (*.xmi)\n"
 "*.xmi.tgz|Ficheiros XMI Comprimidos com Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Ficheiros XMI Comprimidos com Bzip2 (*.xmi.tar.bz2)\n"
@@ -2643,6 +2673,10 @@ msgstr ""
 "*.xmi.tar.bz2|Ficheiro XMI Comprimidos com Bzip2 (*.xmi.tar.bz2)\n"
 "*|Todos os Ficheiros"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2651,6 +2685,10 @@ msgstr ""
 "O ficheiro %1 já existe!\n"
 "Deseja sobrepô-lo?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Sobrepor"
@@ -2686,12 +2724,12 @@ msgstr "A inserir o conteúdo da área de transferência..."
 
 #: 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 ""
-"O Umbrello não conseguiu colar o conteúdo da área de transferência. Os objectos "
-"na área de transferência poderão ser de um tipo inválido para serem colados "
-"aqui."
+"O Umbrello não conseguiu colar o conteúdo da área de transferência. Os "
+"objectos na área de transferência poderão ser de um tipo inválido para serem "
+"colados aqui."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2746,1263 +2784,1324 @@ msgstr "Todos os Ficheiros"
 msgid "Select Code to Import"
 msgstr "Seleccione o Código a Importar"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nome da classe:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nome do actor:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "novo_atributo"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nome do pacote:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novo_modelo"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nome do caso de utilização:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operação"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nome da interface:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "novo_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nome do componente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_campo"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nome do artefacto:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Modelo UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Nome do enumerado:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Vista Lógica"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nome do tipo de dados:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Vista dos Casos de Utilização"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nome da entidade:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Vista de Componentes"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Nome do e&stereótipo:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Vista de Entrada em Produção"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Nome do &pacote:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model Entidade Relação"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Classe a&bstracta"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipos de dados"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Caso de uso a&bstracto"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"O ficheiro actual foi modificado.\n"
+"Deseja gravá-lo?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Executável"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "O ficheiro %1 não existe."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Desenhar Como"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "O ficheiro %1 parece estar corrompido."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Predefinição"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Não existia nenhum ficheiro XMI no ficheiro comprimido %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&lioteca"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Ocorreu um problema ao ler o ficheiro extraído: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabela"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Ocorreu um problema ao ler o ficheiro: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&úblico"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Ocorreu um problema ao enviar o ficheiro: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivado"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagrama de casos de utilização"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tegido"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagrama de classe"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentação"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagrama de sequência"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nome da classe:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagrama de colaboração"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nome da instância:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagrama de estado"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Desenhar como actor"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagrama de actividade"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Instância múltipla"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagrama de componentes"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Mostrar a destruição"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagrama de entrada em produção"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nome do componente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagrama entidade relação"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nome do nó:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Esse é um nome inválido para um diagrama."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nome do estereótipo:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Já existe um diagrama com esse nome."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"O nome que escolheu\n"
-"já está a ser usado.\n"
-"O nome foi reinicializado."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "O Nome Não é Único"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linha:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Preenc&himento:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Pr&edefinição"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Usar o preenchimento"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Actividades"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nova Actividade..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Mudar o Nome"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nova Actividade"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Mudar o Nome da Actividade"
+"O nome que indicou não era único.\n"
+"É isto o que deseja?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Insira o novo nome da actividade:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Nome da Utilização"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Propriedades da Associação"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Indique o Novo Nome"
 
-#: 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 "Configuração Geral"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Tem a certeza que deseja remover o diagrama %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Papeis"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Remover o Diagrama"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Configuração dos Papéis"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "A configurar o documento..."
 
-#: 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 "Configuração dos Tipos de Letra"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "A resolver as referências a objectos..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Tipo de letra da associação"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "A carregar os elementos de UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Propriedades do Modelo"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "A carregar os diagramas..."
 
-#: 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 "Propriedades Gerais"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autogravar%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipo:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Exteriorizar a Pasta"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nome:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Indicar o Nome do Modelo"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Foi indicado um nome de modelo inválido."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Insira o novo nome do modelo:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nome do Modelo Inválido"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vistas"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "O nome do modelo que escolheu já está a ser usado nesta operação."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Nome do Modelo Não-Único"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"O nome que indicou era inválido.\n"
+"O processo de criação foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Propriedades do Atributo da Entidade"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nome Inválido"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Valor por omissão:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"O nome que indicou não era único!\n"
+"O processo de criação foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Tamanho/Valores:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Criação cancelada"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "Incremento &automático"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "A carregar a vista em lista..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Permitir &nulo"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "A pasta deve estar vazia antes de poder ser apagada."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributos:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Pasta Não Vazia"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexação"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Mudança de nome cancelada"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Nenhum"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Mudar o nome de item no tipo de vista em lista %1 ainda não está "
+"implementado."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primário"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Função Não Implementada"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Índ&ice"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"O nome que indicou é inválido.\n"
+"O processo de mudança de nome foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Único"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagrama: %2 Página %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Indicou um nome de atributo de entidade inválido."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Indicar o Nome do Diagram"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nome do Atributo de Entidade Inválido"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Insira o novo nome do diagrama:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"O nome do atributo da entidade que escolheu já está a ser usado nesta operação."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Nome do Atributo da Entidade Não Único"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Visualização"
+"Está prestes a remover o diagrama inteiro.\n"
+"Tem a certeza?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opções de Visualização das Classes"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Remover o Diagrama?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Cores dos Diagramas"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "A exportar a vista..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "O nome que inseriu é inválido."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Ocorreu um erro ao exportar a imagem:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "O nome que indicou não é único."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"O ficheiro seleccionado %1 já existe.\n"
+"Deseja sobrepô-lo?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipo:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "O Ficheiro Já Existe"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Configuração do Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Não é possível criar a pasta: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interface do Utilizador"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Não é possível gravar um diagrama vazio"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Configuração da Interface do Utilizador"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Ocorreu um problema ao gravar o diagrama em %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Cor da linha:"
+#: 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 ""
+"Carregue no Shift ou Ctrl para se mover no eixo dos X. Carregue o Shift e o "
+"Ctrl ao mesmo tempo para se mover no eixo dos Y. Carregue com o botão "
+"direito para cancelar o movimento."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Cor Pr&edefinida"
+#: 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 ""
+"Carregue no Shift ou Ctrl para se mover no eixo dos X. Carregue o Shift e o "
+"Ctrl ao mesmo tempo para se mover no eixo dos Y. Carregue com o botão "
+"direito para cancelar o dimensionamento."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Cor de preenchimento:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objecto"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "&Cor Predefinida"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Mensagem Síncrona"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Largura da linha:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Mensagem Assíncrona"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Largura por O&missão"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Legenda"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Usar a cor de preenchimento"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Nota"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Activar o desfazer"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Caixa"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Utilizar diagramas paginados"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relação"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Utilizar os novos geradores C++/Java/Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Associação Direccional"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Âmbito por omissão dos campos de associação:"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementa (Generalização/Realização)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Gravação Automática"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Histórico Profundo"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Activar a &gravação automática"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Histórico Lato"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Seleccione o intervalo entre gravações automáticas (min):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Juntar"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Sufixo das gravações automáticas:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Ramificar"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>O ficheiro de gravação automática será gravado em ~/autosave.xmi, se a "
-"gravação automática ocorrer antes de ter gravado manualmente o ficheiro.</p>"
-"<p>Se já o tiver gravado, o ficheiro de gravação automática será gravado na "
-"mesma pasta que o ficheiro e terá o mesmo nome que este, seguido do sufixo "
-"indicado.</p>"
-"<p>Se o sufixo for igual ao sufixo do ficheiro que gravou, a gravação "
-"automática irá sobrepor automaticamente o seu ficheiro.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Junção"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Arranque"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Escolha"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logótipo &inicial"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Transição de Actividade"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Dica do dia"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mensagem"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Carregar o ú&ltimo projecto"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "INDEFINIDO"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Iniciar um novo projecto com:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Selecção"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Nenhum Diagrama"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagrama de Classes"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagrama de Casos de Utilização"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagrama de Sequência"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagrama de Colaboração"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Mostrar as operações"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagrama de Estados"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagrama de Actividades"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Limpar o Diagrama"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagrama de Componentes"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagrama de Entrada em Produção"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalização"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Configuração da Classe"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Mostrar a &visibilidade"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Mostrar os atributos"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nome da Associação"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Mostrar as operações"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Mostrar o estereó&tipo"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Mostrar a assinatura dos atributos"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Mostrar o pacote"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Predefinição"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Âmbito Inicial"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Âmbito por omissão dos atributos:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Barra-Barra (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Âmbito por omissão das operações:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Barra-Estrela (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Geração de Código"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Estilo:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Configuração da Geração de Código"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Geração de Código C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Configuração do Visualizador de Código"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Geração do Corpo dos Métodos"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Propriedades da Operação"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Utilizar as seguintes classes no código gerado:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Operação &abstracta"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Âmbito do cla&ssificador (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "Pes&quisa (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variável</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&egido"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementação"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parâmetros"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&vo Parâmetro..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "O utilizador indicou um nome de parâmetro inválido."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nome do Parâmetro Inválido"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"O nome do parâmetro que escolheu\n"
-"já está a ser usado nesta operação."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Nome do Parâmetro Não-Único"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "O nome do parâmetro que escolheu já está a ser usado nesta operação."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nome da classe"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "O utilizador indicou um nome de operação inválido."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Ficheiro de inclusão</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nome de Operação Inválido"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Geração do Projecto"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Já existe uma operação com essa assinatura em %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Cria um novo documento ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Escolha um nome ou lista de parâmetros diferente."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Auto-Gerar Métodos"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Propriedades do Papel A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Métodos construtores vazios"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Propriedades do Papel B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Métodos acessores de associações"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Visibilidade do Papel A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Métodos acessores de atributos"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Visibilidade do Papel B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Do Objecto Pai"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Morfologia do Papel A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Âmbito por omissão dos acessores de atributos:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Morfologia do Papel B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Âmbito por omissão dos campos de associação:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Itens Contidos"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Do Papel Pai"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Documentação de Notas"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Geração de Código Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ovo Atributo..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Cardinal (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nova Op&eração..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Início-Fim (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Modelos"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Geração de Código em Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Novo Mod&elo..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Linguagem"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Literais Enumerados"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Pastas"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Novo Lit&eral Enumerado..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Criar todos os ficheiros gerados na pasta:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributos da Entidade"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Escolher..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Novo Atributo da &Entidade..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Es&colher..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Actividade inicial"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Incluir os ficheiros da pasta:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Actividade final"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Os ficheiros criados com o Gerador de Código serão colocados nesta pasta"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tipo da actividade:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Os ficheiros nesta pasta serão usados como ficheiros de inclusão para o "
+"código gerado"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nome da actividade:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Política de Sobreposição"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Cores dos Elementos"
+#: 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 ""
+"Se já existir um ficheiro com o mesmo nome que\n"
+"um dos que o gerador de código pretender usar:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Propriedades do Atributo"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "S&obrepor"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Valor &inicial:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Sobrepor os ficheiros já existente se estiverem na pasta de destino"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Público"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Per&guntar"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "O utilizador indicou um nome de atributo inválido."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Se já existir um ficheiro com o mesmo nome, pergunta o que deve fazer"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nome do Atributo Inválido"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Usar um nome diferente"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "O nome do atributo que escolheu já está a ser usado nesta operação."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Se já existir um ficheiro na pasta de destino, seleccionar um nome diferente "
+"a usar adicionando um sufixo ao nome do ficheiro"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Nome do Atributo Não-Único"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatação"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Seleccionar a Operação"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linhas"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Número de sequência:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Estilo de fim de linha:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operação da classe:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Tipo de indentação:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Operação personalizada:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Tamanho da indentação:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramas"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtro"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Diagrama a&ctual"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "Todos os di&agramas"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Sem Indentação"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Seleccionar os diagramas"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulação"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tipo de diagrama"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Espaço"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Selecção"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Verbosidade dos Comentários"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Colaboração"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Escrever os comentários para as &secções \n"
+"mesmo que estas estejam vazias"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sequência"
+#: 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 ""
+"Escrever os comentários para indicar as diferentes secções ('public', "
+"'private', etc...) numa classe, mesmo que estas estejam vazias"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Entrada em Produção"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Escre&ver os comentários de documentação mesmo que vazios"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Não está seleccionado nenhum diagrama."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Escrever os comentários de documentação para as classes e &métodos mesmo que "
+"estes estejam vazios"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opções de Visualização"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Opções da Linguagem"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Configuração dos Atributos"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Assistente de Geração de Código"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Configuração da Operação"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Seleccionar as Classes"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Configuração do Modelo"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Coloque todas as classes para as quais pretende\n"
+"gerar código na lista do lado direito"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Configuração dos Literais Enumerados"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Adicionar a classe para a geração de código"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Configuração de Atributos da Entidade"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Classes Seleccionadas"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Configuração dos Conteúdos"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Remover a classe da geração de código"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associações"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Classes Disponíveis"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Associações da Classe"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Estado da Geração de Código"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operaçõ&es"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Carregue no botão Geração para iniciar a geração de código"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibilidade"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Estado da Geração"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Assinatura das o&perações"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Mostrar os blocos escondidos"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&cote"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">nome do componente aqui</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributos"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Estereót&ipo"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Mostrar o tipo do bloco"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Assinatura dos atr&ibutos"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Cores"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Desenhar como um circulo"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Tipo de letra:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Estado inicial"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papel:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Estado final"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Seleccionado:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tipo do estado:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Bloco de objecto UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nome do estado:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Bloco escondido:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Cor do Elemento"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"center\">Texto não editável:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_classe"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Texto editável:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nova Classe"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Propriedades do Diagrama"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributos da Classe"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Ampliação:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operações da Classe"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Propriedades do Parâmetro"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Mostrar a &grelha"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Direcção de Passagem"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Ajus&tar à grelha"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Ajustar tamanho dos componentes"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" é um parâmetro apenas de leitura, \"out\" é um parâmetro apenas de "
-"escrita e \"inout\" é um parâmetro de leitura e escrita."
+"Ajusta o tamanho dos componentes para um múltiplo do espaçamento da grelha.\n"
+"Se 'Ajustar à Grelha' estiver activo os componentes ficarão sempre alinhados "
+"com a grelha em todos os 4 lados."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Gerar"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Espaçamento da grelha:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Terminar"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Código Gerado"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Não Gerado"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Largura da linha:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ainda Não Gerado"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exportar todas as vistas"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "A pasta %1 não existe. Deseja criá-la agora?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "Pasta on&de gravar os diagramas:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "A Pasta de Saída Não Existe"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "A pasta de base usada para gravar as imagens"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Criar uma Pasta"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Tipo de &imagem:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Não Criar"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Usar &pastas"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Não foi possível criar a pasta.\n"
-"Verifique que tem acesso de escrita à pasta que a contém ou seleccione uma "
-"pasta válida."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Erro ao Criar Pasta"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Por favor seleccione uma pasta válida."
+"Cria na pasta de destino a mesma estrutura em árvore usada\n"
+"no documento para gravar as vistas"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"A pasta de saída já existe, mas não é possível escrever nela.\n"
-"Por favor modifique as permissões ou escolha outra pasta."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Erro ao Escrever para Pasta de Saída"
+"As vistas são gravadas em pastas do documento. É usada a mesma estrutura em "
+"árvore, usada no documento, para gravar as vistas na pasta de base "
+"seleccionada, se activar esta opção.\n"
+"Só as pastas criadas pelo utilizador é que serão criadas na pasta de base (a "
+"vista lógica, a vista de casos de uso e as outras não são criadas)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "O %1 não parece ser uma pasta. Por favor escolha uma pasta válida."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Morfologia do Papel"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Por Favor Escolha uma Pasta Válida"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Visibilidade do Papel"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "O Ficheiro de Destino Já Existe"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportar"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"O ficheiro %1 já existe em %2.\n"
-"\n"
-"O Umbrello pode sobrepor o ficheiro, gerar um nome\n"
-"semelhante ou não gerar este ficheiro."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Aplicar para todos os outros ficheiros"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "S&obrepor"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Gerar um Nome de Ficheiro Semelhante"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Não Gerar o Ficheiro"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nenhuma Opção Disponível.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicidade"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Indique a multiplicidade:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nome da Associação"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Indique o nome da associação:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nome do Papel"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Indique o nome do papel:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Indique o nome da operação:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Insira o novo texto:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERRO"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Mudar o Texto"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Alinhar à Esquerda"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Alinhar à Direita"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagrama"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Alinhar ao Topo"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Novo"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alinhar ao Fundo"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "M&ostrar"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Alinhar o Centro na Vertical"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Ampliação:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Alinhar o Centro na Horizontal"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Código"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Distribuição Alinhada na Vertical"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Linguagem Activa"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Distribuição Alinhada na Horizontal"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Para o alinhamento, você terá de seleccionar pelo menos 2 objectos, como por "
-"exemplo classes ou acções. Não poderá alinhar associações."
+"<p>Bem-vindo ao Umbrello.</p>\n"
+"<p>Os diagramas em UML permitem-lhe desenhar e documentar o 'software' "
+"orientado por objectos.  <a href=\"help:/umbrello\">O Manual do Umbrello</a> "
+"é uma boa introdução ao uso do UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Esta palavra-chave está reservada na linguagem do gerador de código "
-"configurado."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Palavra-chave Reservada"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "A exportar a vista..."
+"<p>Bem-vindo ao Umbrello 1.5.  As novidades desta versão são as classes de "
+"associação, a geração de código em Ruby, a exteriorização de pastas, a "
+"capacidade de mudar interfaces para classes, entre outras novidades.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Ocorreu um erro ao exportar a imagem:\n"
+"<p>Os Diagramas em Páginas e as Pastas Exteriorizadas são mutuamente "
+"exclusivos. Se necessita de Pastas Externas, desligue então a opção &quot;"
+"Usar diagramas em páginas&quot; na Configuração Geral.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"O ficheiro seleccionado %1 já existe.\n"
-"Deseja sobrepô-lo?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "O Ficheiro Já Existe"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "novo_actor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "novo_casodeutilização"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "novo_pacote"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nova_componente"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "novo_nó"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "novo_artefacto"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nova_interface"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "novo_tipodedados"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "novo_enumerado"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nova_entidade"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nova_pasta"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "novo_objecto"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Vazio"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argumento mal formado"
+"<p>A maioria dos itens dos diagramas não podem ser redimensionados; eles "
+"irão mudar o seu tamanho para se ajustar ao seu conteúdo.\n"
+"As caixas, notas e mensagens dos diagramas de sequência poderão ser "
+"redimensionados, bastando para tal carregar e arrastar o quadrado vermelho.</"
+"p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tipo de argumento desconhecido"
+#: 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 ""
+"<p>Se quiser adicionar uma classe já existente a um diagrama, basta arrastar "
+"o seu item da janela da árvore.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nome de método ilegal"
+#: 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 ""
+"<p>O agente de refactoração do Umbrello permite-lhe mover as operações entre "
+"uma classe e as suas classes derivadas ou de base.\n"
+"Carregue com o botão direito numa classe para abrir o agente de refactoração."
+"</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tipo de retorno desconhecido"
+#: 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 ""
+"<p>Os objectos dos diagramas de sequência podem ter uma opção de destruição "
+"e podem ser desenhados como autores. Faça duplo-click para \n"
+"a janela de Propriedades.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "O erro não é conhecido"
+#: 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 ""
+"<p>As mensagens dos diagramas de sequência podem actuar como construtores. "
+"Carregue na caixa do objecto (em vez da linha vertical) para o tornar um "
+"construtor.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Adicionar uma Classe Base"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Os diagramas de sequência suportam mensagens para si próprios. Carregue "
+"de novo na mesma linha vertical para criar uma mensagem automática.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Adicionar uma Classe Derivada"
+#: 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 ""
+"<p>Se, no carregamento de um ficheiro legado, não for mostrado nada na "
+"lista, tente gravar o modelo com outro nome,\n"
+"fechá-lo e voltar a carregar o ficheiro gravado. Normalmente, neste caso, a "
+"lista será então preenchida correctamente.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Adicionar uma Operação"
+#: 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 ""
+"<p>O Cortar e o Colar também irão exportar a imagem para uma área de "
+"transferência de PNG a qual poderá ser colada no KWord e em outras "
+"aplicações.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Adicionar um Atributo"
+#: 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 ""
+"<p>As associações não tem de ser linhas direitas, se carregar duas vezes "
+"numa, irá criar um ponto móvel.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Adicionar uma Interface Base"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Pode activar a gravação automática na janela Configurar o Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Adicionar uma Interface Derivada"
+#: 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 ""
+"<p>Existe alguma funcionalidade em falta que precise no Umbrello? Diga-nos "
+"qual é.\n"
+"Adicione-a à base de dados de erros com o Comunicar um Erro no menu de Ajuda "
+"ou envie-o para a lista de correio do uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Classificadores Base"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Pode remover todos os objectos seleccionados ao carregar em Del ou "
+"Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Classificadores Derivados"
+#: 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 ""
+"<p>Se descobriu um erro no Umbrello, indique-nos.\n"
+"Pode submeter os erros com a ferramenta de Comunicar um Erro no menu de "
+"Ajuda.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Não é possível criar a pasta: %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 ""
+"<p>Se carregar na tecla Escape escolhe a ferramenta actual como sendo a de "
+"selecção.\n"
+"O Backspace salta para a ferramenta usada anteriormente.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Não é possível gravar um diagrama vazio"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Pode seleccionar todos os objectos ao carregar em Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Ocorreu um problema ao gravar o diagrama em %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 ""
+"<p>Pode criar e configurar uma nova classe usando o Assistente de Novas "
+"Classes no menu Código.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "novo_estereótipo"
diff --git a/tde-i18n-pt_BR/messages/tdesdk/umbrello.po b/tde-i18n-pt_BR/messages/tdesdk/umbrello.po
index 1c455f5751f..ed042c72e11 100644
--- a/tde-i18n-pt_BR/messages/tdesdk/umbrello.po
+++ b/tde-i18n-pt_BR/messages/tdesdk/umbrello.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-09-02 14:07+0300\n"
 "Last-Translator: Marcus Gama <marcus.gama@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -22,248 +22,208 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Gerador autônomo de código do Modelador de UML Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Arquivo a transformar"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "O arquivo XSLT a usar"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Autores do Modelador de "
-"UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autores do Modelador UML Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Marcus Gama"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Exportando todas as visões..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "marcus.gama@gmail.com"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Ocorreram alguns erros ao exportar as imagens:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Insira Nome da Atividade"
 
-#: 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 "Ocorreu um problema ao salvar o arquivo: %1"
+#: 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 "Insira o nome da nova atividade:"
 
-#: 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 "Erro ao Salvar"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Alinhar à Esquerda"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objeto"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Alinhar à Direita"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Mensagem síncrona"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Alinhar ao Topo"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Mensagem Assíncrona"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Alinhar Abaixo"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Associação"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Alinhar ao Centro Vertical"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Inclusão"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Alinhar ao Centro Horizontal"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Âncora"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Distribuição Alinhada na Vertical"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Rótulo"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Distribuição Alinhada na Horizontal"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Nota"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Para alinhamento você deve selecionar ao menos 2 objetos como classes ou "
+"atores. Você não pode alinhar associações."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Caixa"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatação"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Ator"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Dependência"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalização"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregação"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Relacionamento"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Associação Direcional"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementa (Generalização/Realização)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Composição"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Caso de Uso"
-
-#. 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 "Classe"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Estado Inicial"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Estado Final"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Ramo/Mesclagem"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Bifurcar/Juntar"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Pacote"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Componente"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nó"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Dependência"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefato"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Associação"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interface"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Associação Própria"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tipo de dado"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Mensagem de Colaboração"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumerações"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Mensagem de Seqüência"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entidade"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Mensagem de Colaboração Própria"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Histórico Profundo"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Mensagem de Seqüência Própria"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Histórico Lato"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Inclusão"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Juntar"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Composição"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Ramificar"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realização"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Junção"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Associação Uni"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Escolha"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Âncora"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Transição de Estado"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Transição de Atividade"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Atividade"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Estado"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Multiplicidade"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Atividade Final"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Insira multiplicidade:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Atividade Inicial"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Nome da Associação"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mensagem"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Insira o nome da associação:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "INDEFINIDO"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Nome da Regra"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Selecionar"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Insira nome da regra:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Uma operação com o mesmo nome e assinatura já existem. Você não pode "
+"adicioná-los novamente."
+
+#: 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 "Este é um nome inválido."
+
+#: 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 "Nome Inválido"
+
+#: 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 "Este nome já está sendo usado."
+
+#: 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 "Não é um Nome Único"
 
 #: 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."
+"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 ""
-"Pelo menos um dos ítens na área de transferência não pode ser colado porque um "
-"ítem com o mesmo nome já existe.  Todos os outros ítens foram colados."
+"Pelo menos um dos ítens na área de transferência não pode ser colado porque "
+"um ítem com o mesmo nome já existe.  Todos os outros ítens foram colados."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -274,18 +234,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Não foi possível abrir arquivo %1 para escrita. Por favor certifique-se de que "
-"a pasta existe e que você tem permissões para gravar nela."
+"Não foi possível abrir arquivo %1 para escrita. Por favor certifique-se de "
+"que a pasta existe e que você tem permissões para gravar nela."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Impossível Abrir Arquivo"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Não foi possível criar a pasta:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Não foi possível criar a pasta:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -299,1356 +257,1523 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Não Foi Possível Criar Pasta"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Insira Nome do Estado"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Opções Gerais"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Insira o nome do novo estado:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Pacote é um espaço de nome"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Inserir Atividade"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Destrutores virtuais"
 
-#: 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 "Insira o nome da nova atividade:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Construtores vazios gerados"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nova atividade"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Métodos acessores gerados"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Modelo UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operações são em linha"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Visão Lógica"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Acessores são em linha"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Visão Caso de Uso"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Acessores são públicos"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Visão do Componente"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importando o arquivo: %1 Progresso: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Visão de Distribuição"
+#: 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 "Pronto."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Modelo de Relacionamento de Entidade"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "O escopo %1 é de um espaço de nome ou de uma classe?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipos de dados"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "A Importação de C++ Necessita de Sua Ajuda"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"O arquivo atual foi modificado.\n"
-"Você deseja salvá-lo?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Espaço de nomes"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "O arquivo %1 não existe."
+#: 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 "Classe"
 
-#: 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 "Erro de Carregamento"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Erro Interno"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "O arquivo %1 parece corrompido."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Erro de Sintaxe antes de '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Não havia nenhum arquivo XMI no arquivo compactado %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Erro de Análise antes de '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Ocorreu um problema ao carregar o arquivo compactado: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Ocorreu um problema ao carregar o arquivo: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "expressão esperada"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Ocorreu um problema ao enviar arquivo: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Erro de sintaxe de declaração"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "diagrama de caso de uso"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} esperado"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagrama de classe"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "espaço de nome esperado"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagrama de seqüência"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ esperado"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagrama de colaboração"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Nome de espaço de nomes esperado"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagrama de estado"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Necessário um especificador de tipo para declarar"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagrama de atividade"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "esperado uma declaração"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagrama do componente"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Expressão constante esperada"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagrama de distribuição"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' esperado"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagrama de relacionamento de entidade"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "} faltando"
 
-#: 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 "Nome"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Inicializadores de membro esperados"
 
-#: 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 "Insira nome:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Especificador de classe base esperado"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Este é um nome inválido para um diagrama."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Cláusula inicializadora esperada"
 
-#: 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 "Nome Inválido"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Identificador esperado"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Um diagrama já está usando este nome."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Id de tipo esperada"
 
-#: 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 "Não é um Nome Único"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Nome de classe esperado"
 
-#: 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 "Este é um nome inválido."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "condição esperada"
 
-#: 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 "Este nome já está sendo usado."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "sentença esperada"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"O nome que você inseriu não é único.\n"
-"É isso que você deseja?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "para inicialização esperado"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Nome Não Único"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "prendedor esperado"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Nome do Uso"
+#: 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 "&Propriedades"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Insira o Novo Nome"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Atividade inicial"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Você tem certeza que deseja excluir o diagrama %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Atividade final"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Excluir Diagrama"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Ramo/Mesclagem"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Configurando o documento..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Bifurcar/Juntar"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Resolvendo referências de objeto..."
+#: 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 "Geral"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Carregando elementos UML..."
+#: 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 "Propriedades Gerais"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Carregando diagramas..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tipo de atividade:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "Diagrama-uml-kde"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Nome da atividade:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosalvar%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 "Documentação"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Exteriorizar Pasta"
+#: 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 "Fonte:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Inserir o Nome do Modelo"
+#: 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 "Configurações de Fonte"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Insira o novo nome do modelo:"
+#: 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 "Cor"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Visões"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Cores do Widget"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"O nome que você inseriu é inválido.\n"
-"O processo de criação foi cancelado."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Atividades"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Nome Não Válido"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nova Atividade..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"O nome que você inseriu não é único!\n"
-"O processo de criação foi cancelado."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Excluir Âncora"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Criação cancelada"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Renomear"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Carregando visão em lista..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nova Atividade"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "A pasta deve estar vazia antes de poder ser excluída."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nova atividade"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Pasta Não Vazia"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Renomear Atividade"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Uma operação com o mesmo nome e assinatura já existem. Você não pode "
-"adicioná-los novamente."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Insira o novo nome da atividade:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Insira Nome da Atividade"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "novo estado"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tipo:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalização"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associações"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Associação Própria"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Propriedades da Associação"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Mensagem de Colaboração"
+#: 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 "Configurações Gerais"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Mensagem de Seqüência"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Regras"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Mensagem de Colaboração Própria"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Configurações de Regra"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Mensagem de Seqüência Própria"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Associação de fonte"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realização"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Propriedades da Regra A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Associação Uni"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Propriedades da Regra B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportar"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Visibilidade da Regra A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagrama"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Visibilidade da Regra B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Novo"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Alterabilidade da Regra A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "M&ostrar"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Alterabilidade da Regra B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Código"
+msgid "Rolename:"
+msgstr "Nome da regra:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "&Linguagem Ativa"
+msgid "Multiplicity:"
+msgstr "Multiplicidade:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Documentação"
+msgid "Public"
+msgstr "Pública"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Barra-Barra (//)"
+msgid "Private"
+msgstr "Privada"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Barra-Asterisco (/**  */)"
+msgid "Protected"
+msgstr "Protegida"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Estilo:"
+msgid "Implementation"
+msgstr "Implementação"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Geração de Código C++</p>"
+msgid "Changeable"
+msgstr "Alterável"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Geral"
+msgid "Frozen"
+msgstr "Congelada"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Geração de Corpo do Método"
+msgid "Add only"
+msgstr "Adicionar somente"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Use o seguinte para classes no código gerado:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Nome da classe:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Nome do ator:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vetor"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Nome do pacote:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variável</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Nome do caso de uso:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Nome da interface:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Nome do componente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "texto"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Nome do artefato:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Nome da enumeração:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Nome do tipo de dado:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Nome da entidade:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Nome do estereótipo:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Nome do pacote:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Nome da classe"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Classe a&bstrata"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Arquivo de inclusão</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Caso de uso a&bstrato"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Geração de Projeto"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Executável"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Criar documento de construção ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Desenhar Como"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Métodos Auto-Gerados"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Padrão"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Métodos construtores vazios"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Preenchimento:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Métodos acessores de associação"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&lioteca"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Métodos acessores de atributo"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabela"
 
-#. 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 "Pública"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Visibilidade"
 
-#. 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 "Privada"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "P&úblico"
 
-#. 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 "Protegida"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivado"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Objeto Parente De"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Pro&tegido"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Escopo do acessor de atributo padrão:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentação"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Escopo da campo de associação:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Nome da classe:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Da Regra Pai"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Nome da instância:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Geração de Código Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Desenhar como ator"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Cardinal (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Instância múltipla"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Início-Fim (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Mostrar destruição"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Geração de Código em Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Nome do componente:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nome do nó:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Nome do estereótipo:"
+
+#: 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 ""
+"O nome que você escolheu\n"
+"já está sendo usado.\n"
+"O nome será reiniciado."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Nome é Não Único"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributos"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ovo Atributo..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operações"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&ova Operação..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Modelos"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&ovo Modelo..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enumerações Literais"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ova Enumeração Literal..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributos da Entidade"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ovo Atributo de Entidade..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Excluir Âncora"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Propriedades"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Mostrar"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Operações"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Visibilidade"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Assinatura da o&peração"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&cote"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributos"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Estereót&ipo"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Assinatura do atr&ibuto"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Desenhar como círculo"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Exibir"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opções de Exibição"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Configurações do Atributo"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Configurações da Operação"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Configurações de Modelos"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Configurações de Enumerações Literais"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Configurações de Atributos de Entidade"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Inclusão"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Configurações de Conteúdo"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Associações de Classe"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_classe"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nova Classe"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributos de Classe"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operações de Classe"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Opções de Geração de Código"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Linguagem"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Gerar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Pastas"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Terminar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Gravar todos os arquivos gerados para pasta:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Código Gerado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Navegar..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Não Gerado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "N&avegar..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Não Gerado Ainda"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Incluir arquivos de cabeçalho da pasta:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "A pasta %1 não existe. Deseja criá-la agora?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Arquivos gerados pelo Gerador de Código serão gravados para esta pasta"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "A Pasta de Saída Não Existe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Criar uma Pasta"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Não Criar"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Arquivos nesta pasta serão usados como arquivos de cabeçalho na geração do "
-"código"
+"Não foi possível criar a pasta.\n"
+"Verifique se tem acesso de escrita à pasta que a contém ou selecione uma "
+"pasta válida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Política de Sobrescrita"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Erro ao Criar Pasta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Por favor selecione uma pasta válida."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Se já existir um arquivo com o mesmo nome que o gerador de\n"
-"código deseja usar como arquivo de saída:"
+"A pasta de saída já existe, mas não é possível escrever nela.\n"
+"Por favor modifique as permissões ou escolha outra pasta."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Sobrescre&ver"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Erro ao Escrever para Pasta de Saída"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Sobrescrever arquivos existentes se eles existem na pasta destino"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "O %1 não parece ser uma pasta. Por favor escolha uma pasta válida."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Perguntar"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Por Favor Escolha uma Pasta Válida"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Se um arquivo com o mesmo nome já existe, pergunte o que fazer"
+msgid "Code Viewer"
+msgstr "Visualizador de Código"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Usar um nome diferente"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nenhuma Opção Disponível.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Se um arquivo já existe na pasta destino, seleciona um nome diferente para usar "
-"adicionando um sufixo ao nome do arquivo"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatação"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linhas"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Diagrama &atual"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Estilo de final de linha:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Todos diagramas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Tipo de indentação:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "Diagramas &selecionados"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Quantidade de indentação:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tipo de diagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Seleção"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Caso de Uso"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Colaboração"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Sem Indentação"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Seqüência"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Estado"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Espaço"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Componente"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Comentários"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Distribuição"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "Diagrama-uml-kde"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Nenhum diagrama selecionado."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "O formato para o qual serão exportadas as imagens"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Anotar Documentação"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Arquivo Destino Já Existe"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Escrever comentários &para seções mesmo se seção\n"
-"está vazia"
+"O arquivo %1 já existe em %2.\n"
+"\n"
+"O Umbrello pode sobrescrever o arquivo, gerar um nome\n"
+"de arquivo similar ou não gerar este arquivo."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Aplicar para todos os arquivos restantes"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "S&obrescrever"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Gerar Nome de Arquivo Similar"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Não Gerar Arquivo"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Propriedades do Parâmetro"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tipo:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Nome:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Valor &inicial:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Direção de Passagem"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Escrever comentários para indicar as diferentes seções (pública, privada, etc) "
-"numa classe, mesmo se as seções estiverem vazias"
+"\"in\" é um parâmetro somente de leitura, \"out\" é um parâmetro somente de "
+"escrita e \"inout\" é um parâmetro de leitura e escrita."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Escrever comentários da documentação mesmo se vazio"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Ítens Contidos"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Escrever comentários &para documentação de classe e método mesmo se vazio"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Selecionar Operação"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Opções de Linguagens"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Número da seqüência:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Assistente de Geração de Código"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operação de classe:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Selecionar Classes"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Operação personalizada:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Configurar Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Interface com Usuário"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Configurações de Interface com Usuário"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Cor da linha:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Cor &Padrão"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Cor de preenchimento:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Cor Pa&drão"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Largura da linha:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Largura P&adrão"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Usar cor de preenchimento"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Colocar todas as classes para as quais deseja gerar código\n"
-"no lado direito da lista"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Adicionar classe para geração de código"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Habilitar desfazer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Classes Selecionadas"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Usar diagramas em abas"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Remover classe da Geração de Código"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Usar os novos geradores C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Classes Disponíveis"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Usar associação angular de linhas"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Estado da Geração de Código"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Autosalvar"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Pressione o botão de Geração para iniciar a geração de código"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Habilitar autosalvar"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Estado da Geração"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Selecionar intervalo de auto-salvar (mins):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Visualizador de Código"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Configurar sufixo de autosalvamento:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Mostrar blocos ocultos"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>O arquivo de salvamento automático será salvo em ~/autosave.xmi, se o "
+"salvamento automático ocorrer antes de ter salvo manualmente o arquivo.</"
+"p><p>Se você já o tiver salvo, o arquivo de salvamento automático será salvo "
+"na mesma pasta que o arquivo e terá o mesmo nome que ele, seguido do sufixo "
+"indicado.</p><p>Se o sufixo for igual ao sufixo do arquivo que salvou, o "
+"salvamento automático irá sobrepor automaticamente o seu arquivo.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">nome do componente aqui</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Inicialização"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Mostrar tipo de bloco"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logotipo de &inicialização"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Cores"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Dica do dia"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Fonte:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Carregar último projeto"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papel:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Iniciar novo projeto com:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Selecionado:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Nenhum Diagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">bloco de objeto UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagrama de Classe"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Bloco oculto:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagrama de Caso de Uso"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Texto ineditável:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagrama de Seqüência"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Texto editável:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagrama de Colaboração"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Propriedades do Diagrama"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagrama de Estado"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Nome:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagrama de Atividade"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Ampliação:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagrama do Componente"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagrama de Distribuição"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Configurações de Classe"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Mostrar &visibilidade"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Mostrar atributos"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Mostrar operações"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Mostrar estereót&ipo"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Mostrar assinatura do atributo"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Mostrar pacote"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Mostrar assinatura da operação"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Mostrar &grade"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Iniciando Escopo"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Ajus&tar à grade"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Escopo do atributo padrão:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Ajustar tamanho do componente"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Escopo da operação padrão:"
 
-#. 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."
-msgstr ""
-"Ajusta o tamanho dos componentes para serem múltiplos do espaçamento da grade.\n"
-"Se 'Ajustar à Grade' estiver habilitado um componente estará sempre alinhado "
-"com a grade em todos os seus 4 lados."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Geração de Código"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Espaçamento da grade:"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Configurações de Geração de Código"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Configurações do Visualizador de Código"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Estado inicial"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Largura da linha:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Estado final"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exportar todas as visões"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tipo de estado:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "Pasta on&de salvar os diagramas:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Nome de estado:"
 
-#. 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"
-msgstr "A pasta de base usada para salvar as imagens"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Cor do Widget"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Tipo de &imagem:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Propriedades do Atributo"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "O formato para o qual serão exportadas as imagens"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "E&scopo de classificação (\"static\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Usar &pastas"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Público"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Cria na pasta de destino a mesma estrutura em árvore usada\n"
-"no documento para salvar as visões"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Prot&egida"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementação"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Você inseriu um nome de atributo inválido."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Nome de Atributo Inválido"
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen is already being used in this operation."
 msgstr ""
-"As visões são salvas em pastas do documento. É usada a mesma estrutura em "
-"árvore, usada no documento, para salvar as visões na pasta de base selecionada, "
-"se ativar esta opção.\n"
-"Só as pastas criadas pelo usuário serão criadas na pasta de base (a visão "
-"lógica, a visão de casos de uso e as outras não são criadas)."
+"O nome de atributo que você escolheu já está sendo usado nesta operação."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Propriedades da Regra"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Nome do Atributo Não Único"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Nome da regra:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Propriedades do Atributo da Entidade"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Multiplicidade:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Valor &padrão:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Alterabilidade da Regra"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Comprimento/Valores:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Adicionar somente"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Auto-incremento"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Congelada"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Permitir &nulo"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Alterável"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributos:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Visibilidade da Regra"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexação"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementação"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Nenhuma"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Bem vindo ao Umbrello.</p>\n"
-"<p>Diagramas UML permitem que você desenhe e documente programas orientados à "
-"objeto. <a href=\"help:/umbrello\">O Manual do Umbrello</a> "
-"é uma boa introdução ao uso do UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primária"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Bem-vindo ao Umbrello 1.5.  As novidades desta versão são as classes de "
-"associação, a geração de código em Ruby, a exteriorização de pastas, a "
-"capacidade de mudar interfaces para classes, entre outras novidades.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Índice"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Os Diagramas em Páginas e as Pastas Exteriorizadas são mutuamente "
-"exclusivos. Se você necessita de Pastas Externas, desligue então a opção "
-"&quot;Usar diagramas em páginas&quot; na Configuração Geral.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Única"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p> A maioria dos ítens de diagrama não podem ser redimensionados, eles "
-"redimensionam-se para abranger seu conteúdo.\n"
-"Caixas, notas e mensagens do diagrama de seqüência podem ser redimensionados "
-"simplesmente clicando e arrasando os quadrados vermelhos.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Você inseriu um nome de atributo de entidade inválido."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Se você desejar adicionar uma classe já existente ao diagrama simplesmente "
-"arraste esta entrada da visão de árvore.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Nome de Atributo de Entidade Inválido"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Os novos agentes de refabricação do Umbrello permitem-lhe mover operações "
-"entre uma classe e suas derivadas\n"
-"e classes base.\n"
-"Clique direito numa classe para abrir o agente de refabricação.</p>\n"
+"O nome de atributo de entidade que você escolheu já está sendo usado nesta "
+"operação."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Objetos do diagrama de seqüência podem possuir uma caixa destrutora e serem "
-"desenhados como atores.  \n"
-"Clique duplo em um para o diálogo de Propriedades.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Nome do Atributo de Entidade Não Único"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Mensagens do diagrama de sequência pode agir como construtores. Clique na "
-"caixa do objeto (ao invés da linha vertical) para criar um construtor.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Propriedades da Operação"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Diagramas de sequência suportam mensagens para ele mesmo. Clique na mesma "
-"linha vertical novamente para criar uma auto-mensagem.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Operação &abstrata"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Se ao carregar um arquivo externo nada for exibido na visão em lista, tente "
-"salvar o modelo com um nome diferente,\n"
-"fechando e recarregando o arquivo salvo. Normalmente a visão em lista é então "
-"corretamente povoada.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "Pes&quisa (\"const\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Cortar e Copiar também exportará a imagem de um PNG para a área de "
-"transferência que pode ser colada no KWord\n"
-"e outros aplicativos.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parâmetros"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Associações não devem ser em linha reta, clique duplo em uma criará um ponto "
-"móvel.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&vo Parâmetro..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Você pode ligar o auto-salvamento no diálogo de Configuração do Umbrello.</p>"
-"\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Você inseriu um nome de parâmetro inválido."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Existe um recurso faltando que você gostaria no Umbrello? Por favor "
-"informe-nos. \n"
-"Você pode adicioná-lo ao banco de dados de erros com Relato de Erro do menu "
-"Ajuda\n"
-"ou enviá-lo para a lista de correio de desenvolvimento do uml.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a> "
-"</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Nome de Parâmetro Inválido"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Você pode excluir todos os objetos selecionados pressionando Del ou "
-"Backspace.</p>\n"
+"O nome do parâmetro que você escolheu\n"
+"já esta sendo usado nesta operação."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Se você encontrou um erro no Umbrello, por favor informe-nos. \n"
-"Você pode submeter erros com a ferramenta de Relato de Erro no menu Ajuda.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Nome do Parâmetro Não Único"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Pressionar a tecla de Escape configura a ferramenta atual para a ferramenta "
-"selecionada.\n"
-"Backspace salta para a ferramenta anteriormente usada.</p>\n"
+"O nome de parâmetro que você escolheu já está sendo usado nesta operação."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Você inseriu um nome de operação inválido."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Nome de Operação Inválido"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Uma operação com esta assinatura já existe em %1.\n"
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Escolha um nome ou lista de parâmetros diferente."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Propriedades da Regra"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Propriedades do Modelo"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Você inseriu um nome de modelo inválido."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Nome de Modelo Inválido"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Você pode selecionar todos os objetos pressionado Ctrl-A.</p>\n"
+"O nome de parâmetro do modelo que você escolheu já está sendo usado nesta "
+"operação."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Nome do Modelo Não Único"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opções de Exibição de Classe"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Cores do Diagrama"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "O nome que você inseriu é inválido."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "O nome que você inseriu não é único."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Nome Não Único"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linha:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Preenchimento:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "P&adrão"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Usar preenchimento"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Exportando todas as visões..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Ocorreram alguns erros ao exportar as imagens:"
+
+#: 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 "Ocorreu um problema ao salvar o arquivo: %1"
 
-#: tips.txt:108
+#: 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 "Erro ao Salvar"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Gerador autônomo de código do Modelador de UML Umbrello"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Arquivo a transformar"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "O arquivo XSLT a usar"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Você pode criar e configurar uma nova classe usando o Assistente Nova Classe "
-"no menu Código.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Autores do Modelador "
+"de UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autores do Modelador UML Umbrello"
+
+#: 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 "Nome"
+
+#: 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 "Insira nome:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Insira o nome da operação:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Insira novo texto:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ERRO"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Mudar Texto"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "O arquivo da pasta %1 não existe."
+
+#: 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 "Erro de Carregamento"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "O arquivo da pasta %1 não consegue ser aberto."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1702,6 +1827,10 @@ msgstr "Nova Operação..."
 msgid "Select Operation..."
 msgstr "Selecionar Operação..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Mudar Texto..."
@@ -1753,6 +1882,19 @@ msgstr "Novo"
 msgid "Rename..."
 msgstr "Renomear..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Erro de Colagem"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Cor da Linha..."
@@ -1781,14 +1923,26 @@ msgstr "Interiorizar a Pasta"
 msgid "Import Classes..."
 msgstr "Importar Classes..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Pacote"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Sub-Sistema"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefato"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagrama do Componente..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nó"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagrama de Distribuição..."
@@ -1797,10 +1951,18 @@ msgstr "Diagrama de Distribuição..."
 msgid "Folder"
 msgstr "Pasta"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entidade"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagrama de Relacionamento de Entidade..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Ator"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagrama de Caso de Uso..."
@@ -1837,6 +1999,18 @@ msgstr "Novo Atributo de Entidade..."
 msgid "Export as Picture..."
 msgstr "Exportar como Figura..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interface"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tipo de dado"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumerações"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagrama de Classe..."
@@ -1857,26 +2031,10 @@ msgstr "Diagrama de Seqüência..."
 msgid "Collaboration Diagram..."
 msgstr "Diagrama de Colaboração..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributos"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operações"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Somente Público"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Visibilidade"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Assinatura da Operação"
@@ -1889,11 +2047,6 @@ msgstr "Assinatura do Atributo"
 msgid "Stereotype"
 msgstr "Estereótipo"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Mostrar"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atributo..."
@@ -1918,14 +2071,6 @@ msgstr "Cor de Preenchimento..."
 msgid "Use Fill Color"
 msgstr "Usar Cor de Preenchimento"
 
-#: 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 "Cor"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Ator..."
@@ -1954,10 +2099,26 @@ msgstr "Enumeração..."
 msgid "Package..."
 msgstr "Pacote..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Estado Inicial"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Estado Final"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Estado..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Atividade Inicial"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Atividade Final"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Sub-Sistema..."
@@ -2002,6 +2163,14 @@ msgstr "Excluir Âncora"
 msgid "Change Association Name..."
 msgstr "Mudar Nome da Associação..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Limpar Diagrama"
@@ -2036,202 +2205,106 @@ msgstr "a pasta do arquivo"
 
 #: 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 ""
-"manter a estrutura em árvore usada para guardar as visões do documento na pasta "
-"de destino"
+"manter a estrutura em árvore usada para guardar as visões do documento na "
+"pasta de destino"
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2006 Autores do Modelador de UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Uso incorreto de associações."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Erro de Associação"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "O arquivo da pasta %1 não existe."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "O arquivo da pasta %1 não consegue ser aberto."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Marcus Gama"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "marcus.gama@gmail.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 "Pronto."
-
-#: 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 ""
-"Pressione o Shift ou Ctrl para se mover no eixo dos X. Pressione o Shift e o "
-"Ctrl ao mesmo tempo para se mover no eixo dos Y. Clique com o botão direito "
-"para cancelar o movimento."
-
-#: 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 ""
-"Pressione o Shift ou Ctrl para se mover no eixo dos X. Pressione o Shift e o "
-"Ctrl ao mesmo tempo para se mover no eixo dos Y. Clique com o botão direito "
-"para cancelar o dimensionamento."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "O escopo %1 é de um espaço de nome ou de uma classe?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "A Importação de C++ Necessita de Sua Ajuda"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Espaço de nomes"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importando o arquivo: %1 Progresso: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Erro Interno"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Erro de Sintaxe antes de '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Erro de Análise antes de '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "novo_ator"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "expressão esperada"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nova_caixadeuso"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Erro de sintaxe de declaração"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "novo_pacote"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} esperado"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "novo_componente"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "espaço de nome esperado"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "novo_nó"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ esperado"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "novo_artefato"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Nome de espaço de nomes esperado"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nova_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Necessário um especificador de tipo para declarar"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "novo_tipodedado"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "esperado uma declaração"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nova_enumeração"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Expressão constante esperada"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nova_entidade"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' esperado"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nova_pasta"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} faltando"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nova_associação"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Inicializadores de membro esperados"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "novo_objeto"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Especificador de classe base esperado"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Cláusula inicializadora esperada"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Vazio"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Identificador esperado"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Argumento mal formado"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Id de tipo esperada"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Tipo de argumento desconhecido"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Nome de classe esperado"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nome de método ilegal"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "condição esperada"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Tipo de retorno desconhecido"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "sentença esperada"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Erro não especificado"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "para inicialização esperado"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Esta é uma chave reservada para a linguagem do gerador de código configurado."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "prendedor esperado"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Chave Reservada"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2245,105 +2318,66 @@ msgstr "Insira nome do objeto:"
 msgid "new_parameter"
 msgstr "novo_parâmetro"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Opções Gerais"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Pacote é um espaço de nome"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Destrutores virtuais"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Construtores vazios gerados"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Métodos acessores gerados"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operações são em linha"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Acessores são em linha"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Acessores são públicos"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagrama: %2 Página %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Inserir Nome do Diagrama"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Adicionar Classe Base"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Insira o novo nome do diagrama:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Adicionar Classe Derivada"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Você está prestes a excluir o diagrama todo.\n"
-"Você tem certeza?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Adicionar Operação"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Excluir Diagrama?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Adicionar Atributo"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Renomeamento cancelado"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Adicionar Interface Base"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Renomeando um item da visão em lista tipo %1 ainda não implementado."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Adicionar Interface Derivada"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Função Não Implementada"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Classificadores Base"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"O nome que você inseriu é inválido.\n"
-"O processo de renomeamento foi cancelado."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Classificadores Derivados"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nova_associação"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Insira Nome do Estado"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "novo_atributo"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Insira o nome do novo estado:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novo_modelo"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Inserir Atividade"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operação"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Uso incorreto de associações."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "novo_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Erro de Associação"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_campo"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "novo estado"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2497,11 +2531,6 @@ msgstr "&Exportar como Figura..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Export&ar Todos os Diagramas como Imagens..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Propriedades"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Índice Deslizante do &Zoom"
@@ -2586,21 +2615,28 @@ msgstr "&Documentação"
 msgid "Opening file..."
 msgstr "Abrindo arquivo..."
 
+#: 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 "Criando novo documento..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Todos os Arquivos Suportados (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Todos os Arquivos Suportados (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2)\n"
 "*.xmi|Arquivos XMI Comprimidos (*.xmi)\n"
 "*.xmi.tgz|Arquivos XMI Comprimidos com Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Arquivos XMI Comprimidos com Bzip2 (*.xmi.tar.bz2)\n"
@@ -2630,6 +2666,10 @@ msgstr ""
 "*.xmi.tar.bz2|Arquivo XMI Compactado com Bzip2\n"
 "*|Todos os Arquivos"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2638,6 +2678,10 @@ msgstr ""
 "O arquivo %1 existe.\n"
 "Você deseja sobrescrevê-lo?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Sobrescrever"
@@ -2673,11 +2717,11 @@ msgstr "Inserindo o conteúdo da área de transferência..."
 
 #: 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 ""
-"O Umbrello não conseguiu colar o conteúdo da área de transferência. Os objetos "
-"na área de transferência podem ser do tipo errado para se colar aqui."
+"O Umbrello não conseguiu colar o conteúdo da área de transferência. Os "
+"objetos na área de transferência podem ser do tipo errado para se colar aqui."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2732,1267 +2776,1321 @@ msgstr "Todos os Arquivos"
 msgid "Select Code to Import"
 msgstr "Selecione Código para Importar"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Nome da classe:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Nome do ator:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "novo_atributo"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Nome do pacote:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novo_modelo"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Nome do caso de uso:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operação"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Nome da interface:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "novo_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Nome do componente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_campo"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Nome do artefato:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Modelo UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Nome da enumeração:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Visão Lógica"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Nome do tipo de dado:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Visão Caso de Uso"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Nome da entidade:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Visão do Componente"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Nome do estereótipo:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Visão de Distribuição"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Nome do pacote:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Modelo de Relacionamento de Entidade"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Classe a&bstrata"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipos de dados"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Caso de uso a&bstrato"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"O arquivo atual foi modificado.\n"
+"Você deseja salvá-lo?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Executável"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "O arquivo %1 não existe."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Desenhar Como"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "O arquivo %1 parece corrompido."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Padrão"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Não havia nenhum arquivo XMI no arquivo compactado %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&lioteca"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Ocorreu um problema ao carregar o arquivo compactado: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabela"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Ocorreu um problema ao carregar o arquivo: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "P&úblico"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Ocorreu um problema ao enviar arquivo: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivado"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "diagrama de caso de uso"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Pro&tegido"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagrama de classe"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentação"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagrama de seqüência"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Nome da classe:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagrama de colaboração"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Nome da instância:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagrama de estado"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Desenhar como ator"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagrama de atividade"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Instância múltipla"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagrama do componente"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Mostrar destruição"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagrama de distribuição"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Nome do componente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagrama de relacionamento de entidade"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nome do nó:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Este é um nome inválido para um diagrama."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Nome do estereótipo:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Um diagrama já está usando este nome."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"O nome que você escolheu\n"
-"já está sendo usado.\n"
-"O nome será reiniciado."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Nome é Não Único"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linha:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Preenchimento:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "P&adrão"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Usar preenchimento"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Atividades"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nova Atividade..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Renomear"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nova Atividade"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Renomear Atividade"
+"O nome que você inseriu não é único.\n"
+"É isso que você deseja?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Insira o novo nome da atividade:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Nome do Uso"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Propriedades da Associação"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Insira o Novo Nome"
 
-#: 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 "Configurações Gerais"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Você tem certeza que deseja excluir o diagrama %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Regras"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Excluir Diagrama"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Configurações de Regra"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Configurando o documento..."
 
-#: 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 "Configurações de Fonte"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Resolvendo referências de objeto..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Associação de fonte"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Carregando elementos UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Propriedades do Modelo"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Carregando diagramas..."
 
-#: 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 "Propriedades Gerais"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosalvar%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tipo:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Exteriorizar Pasta"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Nome:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Inserir o Nome do Modelo"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Você inseriu um nome de modelo inválido."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Insira o novo nome do modelo:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Nome de Modelo Inválido"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Visões"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"O nome de parâmetro do modelo que você escolheu já está sendo usado nesta "
-"operação."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Nome do Modelo Não Único"
+"O nome que você inseriu é inválido.\n"
+"O processo de criação foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Propriedades do Atributo da Entidade"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Nome Não Válido"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Valor &padrão:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"O nome que você inseriu não é único!\n"
+"O processo de criação foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Comprimento/Valores:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Criação cancelada"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Auto-incremento"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Carregando visão em lista..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Permitir &nulo"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "A pasta deve estar vazia antes de poder ser excluída."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributos:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Pasta Não Vazia"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexação"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Renomeamento cancelado"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Nenhuma"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Renomeando um item da visão em lista tipo %1 ainda não implementado."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primária"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Função Não Implementada"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Índice"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"O nome que você inseriu é inválido.\n"
+"O processo de renomeamento foi cancelado."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Única"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagrama: %2 Página %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Você inseriu um nome de atributo de entidade inválido."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Inserir Nome do Diagrama"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Nome de Atributo de Entidade Inválido"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Insira o novo nome do diagrama:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"O nome de atributo de entidade que você escolheu já está sendo usado nesta "
-"operação."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Nome do Atributo de Entidade Não Único"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Exibir"
+"Você está prestes a excluir o diagrama todo.\n"
+"Você tem certeza?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opções de Exibição de Classe"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Excluir Diagrama?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Cores do Diagrama"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Exportando visão..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "O nome que você inseriu é inválido."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Ocorreu um erro ao exportar a imagem:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "O nome que você inseriu não é único."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"O arquivo selecionado %1 existe.\n"
+"Você deseja sobrescrevê-lo?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tipo:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Arquivo Já Existe"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Configurar Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Não é possível criar a pasta: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Interface com Usuário"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Não é possível salvar um diagrama vazio"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Configurações de Interface com Usuário"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Ocorreu um problema ao salvar o diagrama em %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Cor da linha:"
+#: 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 ""
+"Pressione o Shift ou Ctrl para se mover no eixo dos X. Pressione o Shift e o "
+"Ctrl ao mesmo tempo para se mover no eixo dos Y. Clique com o botão direito "
+"para cancelar o movimento."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Cor &Padrão"
+#: 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 ""
+"Pressione o Shift ou Ctrl para se mover no eixo dos X. Pressione o Shift e o "
+"Ctrl ao mesmo tempo para se mover no eixo dos Y. Clique com o botão direito "
+"para cancelar o dimensionamento."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Cor de preenchimento:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objeto"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Cor Pa&drão"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Mensagem síncrona"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Largura da linha:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Mensagem Assíncrona"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Largura P&adrão"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Rótulo"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Usar cor de preenchimento"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Nota"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Habilitar desfazer"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Caixa"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Usar diagramas em abas"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Relacionamento"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Usar os novos geradores C++/Java/Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Associação Direcional"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Usar associação angular de linhas"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementa (Generalização/Realização)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Autosalvar"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Histórico Profundo"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Habilitar autosalvar"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Histórico Lato"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Selecionar intervalo de auto-salvar (mins):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Juntar"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Configurar sufixo de autosalvamento:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Ramificar"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>O arquivo de salvamento automático será salvo em ~/autosave.xmi, se o "
-"salvamento automático ocorrer antes de ter salvo manualmente o arquivo.</p>"
-"<p>Se você já o tiver salvo, o arquivo de salvamento automático será salvo na "
-"mesma pasta que o arquivo e terá o mesmo nome que ele, seguido do sufixo "
-"indicado.</p>"
-"<p>Se o sufixo for igual ao sufixo do arquivo que salvou, o salvamento "
-"automático irá sobrepor automaticamente o seu arquivo.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Junção"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Inicialização"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Escolha"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logotipo de &inicialização"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Transição de Atividade"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Dica do dia"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mensagem"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Carregar último projeto"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "INDEFINIDO"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Iniciar novo projeto com:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Selecionar"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Nenhum Diagrama"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagrama de Classe"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagrama de Caso de Uso"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagrama de Seqüência"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagrama de Colaboração"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Mostrar operações"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagrama de Estado"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagrama de Atividade"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Limpar Diagrama"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagrama do Componente"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagrama de Distribuição"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalização"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Configurações de Classe"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Mostrar &visibilidade"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Mostrar atributos"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Nome da Associação"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Mostrar operações"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Mostrar estereót&ipo"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Mostrar assinatura do atributo"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Mostrar pacote"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Padrão"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Iniciando Escopo"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Escopo do atributo padrão:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Barra-Barra (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Escopo da operação padrão:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Barra-Asterisco (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Geração de Código"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Estilo:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Configurações de Geração de Código"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Geração de Código C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Configurações do Visualizador de Código"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Geração de Corpo do Método"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Propriedades da Operação"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Use o seguinte para classes no código gerado:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Operação &abstrata"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "E&scopo de classificação (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vetor"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "Pes&quisa (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variável</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Prot&egida"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementação"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parâmetros"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "texto"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&vo Parâmetro..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Você inseriu um nome de parâmetro inválido."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Nome de Parâmetro Inválido"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"O nome do parâmetro que você escolheu\n"
-"já esta sendo usado nesta operação."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Nome do Parâmetro Não Único"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"O nome de parâmetro que você escolheu já está sendo usado nesta operação."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Nome da classe"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Você inseriu um nome de operação inválido."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Arquivo de inclusão</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Nome de Operação Inválido"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Geração de Projeto"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Uma operação com esta assinatura já existe em %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Criar documento de construção ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Escolha um nome ou lista de parâmetros diferente."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Métodos Auto-Gerados"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Propriedades da Regra A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Métodos construtores vazios"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Propriedades da Regra B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Métodos acessores de associação"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Visibilidade da Regra A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Métodos acessores de atributo"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Visibilidade da Regra B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Objeto Parente De"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Alterabilidade da Regra A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Escopo do acessor de atributo padrão:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Alterabilidade da Regra B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Escopo da campo de associação:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Ítens Contidos"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Da Regra Pai"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Anotar Documentação"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Geração de Código Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ovo Atributo..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Cardinal (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ova Operação..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Início-Fim (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Modelos"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Geração de Código em Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ovo Modelo..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Linguagem"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enumerações Literais"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Pastas"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ova Enumeração Literal..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Gravar todos os arquivos gerados para pasta:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributos da Entidade"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Navegar..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ovo Atributo de Entidade..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "N&avegar..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Atividade inicial"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Incluir arquivos de cabeçalho da pasta:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Atividade final"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Arquivos gerados pelo Gerador de Código serão gravados para esta pasta"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tipo de atividade:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Arquivos nesta pasta serão usados como arquivos de cabeçalho na geração do "
+"código"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Nome da atividade:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Política de Sobrescrita"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Cores do Widget"
+#: 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 ""
+"Se já existir um arquivo com o mesmo nome que o gerador de\n"
+"código deseja usar como arquivo de saída:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Propriedades do Atributo"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Sobrescre&ver"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Valor &inicial:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Sobrescrever arquivos existentes se eles existem na pasta destino"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Público"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Perguntar"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Você inseriu um nome de atributo inválido."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Se um arquivo com o mesmo nome já existe, pergunte o que fazer"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Nome de Atributo Inválido"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Usar um nome diferente"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
 msgstr ""
-"O nome de atributo que você escolheu já está sendo usado nesta operação."
+"Se um arquivo já existe na pasta destino, seleciona um nome diferente para "
+"usar adicionando um sufixo ao nome do arquivo"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Nome do Atributo Não Único"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatação"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Selecionar Operação"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linhas"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Número da seqüência:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Estilo de final de linha:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operação de classe:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Tipo de indentação:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Operação personalizada:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Quantidade de indentação:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramas"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtro"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Diagrama &atual"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Todos diagramas"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Sem Indentação"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "Diagramas &selecionados"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tipo de diagrama"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Espaço"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Seleção"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Comentários"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Colaboração"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Escrever comentários &para seções mesmo se seção\n"
+"está vazia"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Seqüência"
+#: 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 ""
+"Escrever comentários para indicar as diferentes seções (pública, privada, "
+"etc) numa classe, mesmo se as seções estiverem vazias"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Distribuição"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Escrever comentários da documentação mesmo se vazio"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Nenhum diagrama selecionado."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Escrever comentários &para documentação de classe e método mesmo se vazio"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opções de Exibição"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Opções de Linguagens"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Configurações do Atributo"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Assistente de Geração de Código"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Configurações da Operação"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Selecionar Classes"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Configurações de Modelos"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Colocar todas as classes para as quais deseja gerar código\n"
+"no lado direito da lista"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Configurações de Enumerações Literais"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Adicionar classe para geração de código"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Configurações de Atributos de Entidade"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Classes Selecionadas"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Configurações de Conteúdo"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Remover classe da Geração de Código"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associações"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Classes Disponíveis"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Associações de Classe"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Estado da Geração de Código"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Operações"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Pressione o botão de Geração para iniciar a geração de código"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Visibilidade"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Estado da Geração"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Assinatura da o&peração"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Mostrar blocos ocultos"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&cote"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">nome do componente aqui</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributos"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Estereót&ipo"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Mostrar tipo de bloco"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Assinatura do atr&ibuto"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Cores"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Desenhar como círculo"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Fonte:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Estado inicial"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papel:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Estado final"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Selecionado:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tipo de estado:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">bloco de objeto UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Nome de estado:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Bloco oculto:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Cor do Widget"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Texto ineditável:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_classe"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Texto editável:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nova Classe"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Propriedades do Diagrama"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributos de Classe"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Ampliação:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operações de Classe"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Propriedades do Parâmetro"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Mostrar &grade"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Direção de Passagem"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Ajus&tar à grade"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Ajustar tamanho do componente"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" é um parâmetro somente de leitura, \"out\" é um parâmetro somente de "
-"escrita e \"inout\" é um parâmetro de leitura e escrita."
+"Ajusta o tamanho dos componentes para serem múltiplos do espaçamento da "
+"grade.\n"
+"Se 'Ajustar à Grade' estiver habilitado um componente estará sempre alinhado "
+"com a grade em todos os seus 4 lados."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Gerar"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Espaçamento da grade:"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Terminar"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Código Gerado"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Não Gerado"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Largura da linha:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Não Gerado Ainda"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exportar todas as visões"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "A pasta %1 não existe. Deseja criá-la agora?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "Pasta on&de salvar os diagramas:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "A Pasta de Saída Não Existe"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "A pasta de base usada para salvar as imagens"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Criar uma Pasta"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Tipo de &imagem:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Não Criar"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Usar &pastas"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Não foi possível criar a pasta.\n"
-"Verifique se tem acesso de escrita à pasta que a contém ou selecione uma pasta "
-"válida."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Erro ao Criar Pasta"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Por favor selecione uma pasta válida."
+"Cria na pasta de destino a mesma estrutura em árvore usada\n"
+"no documento para salvar as visões"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"A pasta de saída já existe, mas não é possível escrever nela.\n"
-"Por favor modifique as permissões ou escolha outra pasta."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Erro ao Escrever para Pasta de Saída"
+"As visões são salvas em pastas do documento. É usada a mesma estrutura em "
+"árvore, usada no documento, para salvar as visões na pasta de base "
+"selecionada, se ativar esta opção.\n"
+"Só as pastas criadas pelo usuário serão criadas na pasta de base (a visão "
+"lógica, a visão de casos de uso e as outras não são criadas)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "O %1 não parece ser uma pasta. Por favor escolha uma pasta válida."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Alterabilidade da Regra"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Por Favor Escolha uma Pasta Válida"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Visibilidade da Regra"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Arquivo Destino Já Existe"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportar"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"O arquivo %1 já existe em %2.\n"
-"\n"
-"O Umbrello pode sobrescrever o arquivo, gerar um nome\n"
-"de arquivo similar ou não gerar este arquivo."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Aplicar para todos os arquivos restantes"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "S&obrescrever"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Gerar Nome de Arquivo Similar"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Não Gerar Arquivo"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nenhuma Opção Disponível.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Multiplicidade"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Insira multiplicidade:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Nome da Associação"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Insira o nome da associação:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Nome da Regra"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Insira nome da regra:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Insira o nome da operação:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Insira novo texto:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ERRO"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Mudar Texto"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Alinhar à Esquerda"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Alinhar à Direita"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagrama"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Alinhar ao Topo"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Novo"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Alinhar Abaixo"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "M&ostrar"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Alinhar ao Centro Vertical"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Ampliação:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Alinhar ao Centro Horizontal"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Código"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Distribuição Alinhada na Vertical"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Linguagem Ativa"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Distribuição Alinhada na Horizontal"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Para alinhamento você deve selecionar ao menos 2 objetos como classes ou "
-"atores. Você não pode alinhar associações."
+"<p>Bem vindo ao Umbrello.</p>\n"
+"<p>Diagramas UML permitem que você desenhe e documente programas orientados "
+"à objeto. <a href=\"help:/umbrello\">O Manual do Umbrello</a> é uma boa "
+"introdução ao uso do UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Esta é uma chave reservada para a linguagem do gerador de código configurado."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Chave Reservada"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Exportando visão..."
+"<p>Bem-vindo ao Umbrello 1.5.  As novidades desta versão são as classes de "
+"associação, a geração de código em Ruby, a exteriorização de pastas, a "
+"capacidade de mudar interfaces para classes, entre outras novidades.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Ocorreu um erro ao exportar a imagem:\n"
+"<p>Os Diagramas em Páginas e as Pastas Exteriorizadas são mutuamente "
+"exclusivos. Se você necessita de Pastas Externas, desligue então a opção "
+"&quot;Usar diagramas em páginas&quot; na Configuração Geral.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"O arquivo selecionado %1 existe.\n"
-"Você deseja sobrescrevê-lo?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Arquivo Já Existe"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "novo_ator"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nova_caixadeuso"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "novo_pacote"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "novo_componente"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "novo_nó"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "novo_artefato"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nova_interface"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "novo_tipodedado"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nova_enumeração"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nova_entidade"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nova_pasta"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "novo_objeto"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Vazio"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Argumento mal formado"
+"<p> A maioria dos ítens de diagrama não podem ser redimensionados, eles "
+"redimensionam-se para abranger seu conteúdo.\n"
+"Caixas, notas e mensagens do diagrama de seqüência podem ser redimensionados "
+"simplesmente clicando e arrasando os quadrados vermelhos.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Tipo de argumento desconhecido"
+#: 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 ""
+"<p>Se você desejar adicionar uma classe já existente ao diagrama "
+"simplesmente arraste esta entrada da visão de árvore.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nome de método ilegal"
+#: 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 ""
+"<p>Os novos agentes de refabricação do Umbrello permitem-lhe mover operações "
+"entre uma classe e suas derivadas\n"
+"e classes base.\n"
+"Clique direito numa classe para abrir o agente de refabricação.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Tipo de retorno desconhecido"
+#: 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 ""
+"<p>Objetos do diagrama de seqüência podem possuir uma caixa destrutora e "
+"serem desenhados como atores.  \n"
+"Clique duplo em um para o diálogo de Propriedades.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Erro não especificado"
+#: 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 ""
+"<p>Mensagens do diagrama de sequência pode agir como construtores. Clique na "
+"caixa do objeto (ao invés da linha vertical) para criar um construtor.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Adicionar Classe Base"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Diagramas de sequência suportam mensagens para ele mesmo. Clique na mesma "
+"linha vertical novamente para criar uma auto-mensagem.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Adicionar Classe Derivada"
+#: 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 ""
+"<p>Se ao carregar um arquivo externo nada for exibido na visão em lista, "
+"tente salvar o modelo com um nome diferente,\n"
+"fechando e recarregando o arquivo salvo. Normalmente a visão em lista é "
+"então corretamente povoada.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Adicionar Operação"
+#: 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 ""
+"<p>Cortar e Copiar também exportará a imagem de um PNG para a área de "
+"transferência que pode ser colada no KWord\n"
+"e outros aplicativos.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Adicionar Atributo"
+#: 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 ""
+"<p>Associações não devem ser em linha reta, clique duplo em uma criará um "
+"ponto móvel.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Adicionar Interface Base"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Você pode ligar o auto-salvamento no diálogo de Configuração do Umbrello."
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Adicionar Interface Derivada"
+#: 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 ""
+"<p>Existe um recurso faltando que você gostaria no Umbrello? Por favor "
+"informe-nos. \n"
+"Você pode adicioná-lo ao banco de dados de erros com Relato de Erro do menu "
+"Ajuda\n"
+"ou enviá-lo para a lista de correio de desenvolvimento do uml.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a> </li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Classificadores Base"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Você pode excluir todos os objetos selecionados pressionando Del ou "
+"Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Classificadores Derivados"
+#: 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 ""
+"<p>Se você encontrou um erro no Umbrello, por favor informe-nos. \n"
+"Você pode submeter erros com a ferramenta de Relato de Erro no menu Ajuda.</"
+"p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Não é possível criar a pasta: %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 ""
+"<p>Pressionar a tecla de Escape configura a ferramenta atual para a "
+"ferramenta selecionada.\n"
+"Backspace salta para a ferramenta anteriormente usada.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Não é possível salvar um diagrama vazio"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Você pode selecionar todos os objetos pressionado Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Ocorreu um problema ao salvar o diagrama em %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 ""
+"<p>Você pode criar e configurar uma nova classe usando o Assistente Nova "
+"Classe no menu Código.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "novo_estereótipo"
diff --git a/tde-i18n-ro/messages/tdesdk/umbrello.po b/tde-i18n-ro/messages/tdesdk/umbrello.po
index 69d176d4c59..d38845d143a 100644
--- a/tde-i18n-ro/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ro/messages/tdesdk/umbrello.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2003-11-09 21:19+0200\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team: Romanian <ro-kde@yahoogroups.com>\n"
@@ -15,289 +15,512 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
 
-#: docgenerators/main.cpp:47
-msgid "File to transform"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
 
-#: 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 ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
+#: aligntoolbar.cpp:41
+msgid "Align Right"
 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:42
+msgid "Align Top"
 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:43
+msgid "Align Bottom"
 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"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
 msgstr ""
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
+msgstr ""
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+
+#: aligntoolbar.cpp:384
+msgid "Information"
+msgstr ""
+
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: association.cpp:84
+msgid "Generalization"
+msgstr ""
+
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
+
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
 msgstr ""
 
 #: association.cpp:87 worktoolbar.cpp:248
 msgid "Association"
 msgstr ""
 
+#: association.cpp:88
+msgid "Self Association"
+msgstr ""
+
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr ""
+
+#: association.cpp:90
+#, fuzzy
+msgid "Sequence Message"
+msgstr "Mesaj"
+
+#: 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"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
 msgstr ""
 
-#: worktoolbar.cpp:252
-msgid "Note"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr "Activitate"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
 msgstr ""
 
-#: worktoolbar.cpp:253
-msgid "Box"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
+#: associationwidget.cpp:2346
+msgid "Association Name"
 msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
 msgstr ""
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
+#: associationwidget.cpp:2366
+msgid "Role Name"
 msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
 msgstr ""
 
-#: worktoolbar.cpp:258
-msgid "Directional Association"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#: 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 ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#: 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 ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+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."
+msgstr ""
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr ""
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid "Cannot create the folder:\n"
+msgstr ""
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr ""
+
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr ""
+
+#: 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 ""
 
-#. 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
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr ""
+
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
+
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+msgid "Namespace"
+msgstr ""
+
+#: 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 ""
 
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
 msgstr ""
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
 msgstr ""
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
 msgstr ""
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
 msgstr ""
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
 msgstr ""
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
 msgstr ""
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 msgstr ""
 
-#: worktoolbar.cpp:277
-msgid "Join"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
 msgstr ""
 
-#: worktoolbar.cpp:278
-msgid "Fork"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
 msgstr ""
 
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
 msgstr ""
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
 msgstr ""
 
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
-msgstr "Activitate"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stare"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
 msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
 msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mesaj"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: 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
+msgid "Properties"
 msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Select"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Activitate iniţială"
+
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
 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."
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 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."
+#: 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 ""
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
+#: 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 ""
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
 msgstr ""
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
 msgstr ""
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
+#: 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 ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
+#: 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"
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
+#: 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 ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: 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 ""
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr ""
+
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr ""
+
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr ""
+
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+msgid "Delete"
+msgstr ""
+
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr ""
+
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
 msgstr ""
 
 #: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
@@ -305,1241 +528,1195 @@ msgstr ""
 msgid "new activity"
 msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
 msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
 msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
+#: 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 ""
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
 msgstr ""
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
 msgstr ""
 
-#: 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"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
 msgstr ""
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
 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/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
 msgstr ""
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, no-c-format
+msgid "Rolename:"
 msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, no-c-format
+msgid "Multiplicity:"
 msgstr ""
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: 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 ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
+#: 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 ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
+#: 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 ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, no-c-format
+msgid "Implementation"
 msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, no-c-format
+msgid "Changeable"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, no-c-format
+msgid "Frozen"
 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"
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, no-c-format
+msgid "Add only"
 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:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
 msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
 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/classgenpage.cpp:54
+msgid "Package &name:"
 msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
 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/classgenpage.cpp:58
+msgid "Interface &name:"
 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/classgenpage.cpp:60
+msgid "Component &name:"
 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/classgenpage.cpp:62
+msgid "Artifact &name:"
 msgstr ""
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
 msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
 msgstr ""
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
 msgstr ""
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
 msgstr ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
 msgstr ""
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
 msgstr ""
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
 msgstr ""
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
 msgstr ""
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
 msgstr ""
 
-#: umllistview.cpp:1007
-msgid "Views"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
 msgstr ""
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
 msgstr ""
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
 msgstr ""
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
 msgstr ""
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
 msgstr ""
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 msgstr ""
 
-#: classifier.cpp:201
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr ""
+
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
 msgstr ""
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: association.cpp:88
-msgid "Self Association"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
 msgstr ""
 
-#: association.cpp:89
-msgid "Collaboration Message"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
 msgstr ""
 
-#: association.cpp:90
-#, fuzzy
-msgid "Sequence Message"
-msgstr "Mesaj"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr ""
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
 msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
+#: 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 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
+#: 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"
+#: 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 ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, no-c-format
-msgid "Slash-Star (/**  */)"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
 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"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
 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:118
+msgid "Display Options"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+msgid "Code Generation Options"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: 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 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"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
 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"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create 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"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
+#: 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 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
+#: 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 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgid "Code Viewer"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
 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/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, 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:"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stare"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
 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/diagramprintpage.cpp:135
+msgid "No diagrams selected."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "&Use a different name"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, no-c-format
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
+"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 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr ""
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Windows (\"\\r\\n\")"
+"\"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 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
 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:30
+msgid "Umbrello Setup"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
 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:54
+msgid "Line color:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
 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:73
+msgid "Line width:"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
 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:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
 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:126
+msgid "Autosave"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
 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:136
+msgid "Select auto-save time interval (mins):"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
+#: dialogs/settingsdlg.cpp:148
+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>"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
 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:172
+msgid "&Load last project"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr ""
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
 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/settingsdlg.cpp:294
+msgid "Code Generation"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
 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/statedialog.cpp:130
+msgid "Widget Color"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
 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/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr ""
+
+#: dialogs/umlattributedialog.cpp:163
 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 attribute name you have chosen 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/umlattributedialog.cpp:164
+msgid "Attribute 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/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
 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/umlentityattributedialog.cpp:73
+msgid "&Default value:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 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/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 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/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
 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/umlentityattributedialog.cpp:115
+msgid "&Primary"
 msgstr ""
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 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/umlentityattributedialog.cpp:121
+msgid "&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/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
 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/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
 msgstr ""
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 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/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name 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/umloperationdialog.cpp:50
+msgid "Operation Properties"
 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/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 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"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 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"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
 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"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
 msgstr ""
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
 msgstr ""
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
 msgstr ""
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 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"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
 msgstr ""
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr ""
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr ""
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr ""
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr ""
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr ""
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: tips.txt:108
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+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 ""
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr ""
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr ""
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+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 ""
+
+#: 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 ""
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr ""
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr ""
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr ""
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr ""
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr ""
+
+#: 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 ""
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
@@ -1594,6 +1771,10 @@ msgstr ""
 msgid "Select Operation..."
 msgstr ""
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr ""
@@ -1643,6 +1824,18 @@ msgstr ""
 msgid "Rename..."
 msgstr ""
 
+#: 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 ""
@@ -1671,14 +1864,26 @@ msgstr ""
 msgid "Import Classes..."
 msgstr ""
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr ""
+
 #: 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 ""
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1687,10 +1892,18 @@ msgstr ""
 msgid "Folder"
 msgstr ""
 
+#: 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 ""
@@ -1727,6 +1940,18 @@ msgstr ""
 msgid "Export as Picture..."
 msgstr ""
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr ""
+
+#: 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 ""
@@ -1747,26 +1972,10 @@ msgstr ""
 msgid "Collaboration Diagram..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr ""
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr ""
-
 #: 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 ""
@@ -1779,11 +1988,6 @@ msgstr ""
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr ""
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr ""
@@ -1808,14 +2012,6 @@ msgstr ""
 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 ""
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1844,10 +2040,26 @@ msgstr ""
 msgid "Package..."
 msgstr ""
 
+#: 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 ""
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr ""
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr ""
@@ -1892,6 +2104,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 ""
@@ -1926,192 +2146,101 @@ 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 ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: 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 ""
-
-#: 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
-msgid "Namespace"
-msgstr ""
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
+#: 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"
+#: model_utils.cpp:264
+msgid "new_folder"
 msgstr ""
 
-#: 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"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: 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
@@ -2126,100 +2255,65 @@ msgstr ""
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr ""
-
-#: 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"
-msgstr ""
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
 msgstr ""
 
-#: 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
@@ -2374,11 +2468,6 @@ msgstr ""
 msgid "Export &All Diagrams as Pictures..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr ""
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2463,14 +2552,21 @@ msgstr ""
 msgid "Opening file..."
 msgstr ""
 
+#: 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 ""
 
 #: 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"
@@ -2497,12 +2593,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 ""
@@ -2538,8 +2642,8 @@ msgstr ""
 
 #: 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
@@ -2594,1223 +2698,1215 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
+#: umldoc.cpp:106
+msgid "Logical View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
+#: umldoc.cpp:108
+msgid "Component View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
+#: 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:149
-msgid "&Library"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
+#: umldoc.cpp:934
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
+#: umldoc.cpp:936
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
+#: umldoc.cpp:938
+msgid "sequence diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
+#: umldoc.cpp:942
+msgid "state diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
+#: umldoc.cpp:944
+msgid "activity diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: umldoc.cpp:946
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
+#: umldoc.cpp:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
 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:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr ""
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr ""
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr ""
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr ""
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr ""
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr ""
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
 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"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
 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"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
 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"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
+#: umllistview.cpp:1007
+msgid "Views"
 msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
+#: 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:54
-msgid "Line color:"
+#: 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:60
-msgid "D&efault Color"
+#: worktoolbar.cpp:245
+msgid "Object"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
+#: worktoolbar.cpp:251
+msgid "Label"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
+#: worktoolbar.cpp:252
+msgid "Note"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
+#: worktoolbar.cpp:253
+msgid "Box"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
+#: worktoolbar.cpp:257
+msgid "Relationship"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
+#: worktoolbar.cpp:277
+msgid "Join"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
+#: worktoolbar.cpp:278
+msgid "Fork"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr ""
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mesaj"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
+#: worktoolbar.cpp:302
+msgid "Select"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
+#: autolayout/newautolayoutdialog.ui:88
+#, no-c-format
+msgid "Shape separation"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
+#: autolayout/newautolayoutdialog.ui:137
+#, no-c-format
+msgid "Ce&nter Diagram"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
+#: autolayout/newautolayoutdialog.ui:183
+#, no-c-format
+msgid "Generalization as Ed&ges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
+#: autolayout/newautolayoutdialog.ui:238
+#, no-c-format
+msgid "Association as Ed&ges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
+#: autolayout/newautolayoutdialog.ui:412
+#, no-c-format
+msgid "&Restore Default"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
 msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Activitate iniţială"
-
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
+#: 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/umlattributedialog.cpp:42
-msgid "Attribute Properties"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
+"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/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
+#: 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/classpropdlg.cpp:118
-msgid "Display Options"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
 msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
 msgstr ""
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
 msgstr ""
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
+#: 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 ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: 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."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr ""
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr ""
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr ""
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr ""
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr ""
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr ""
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr ""
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr ""
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr ""
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr ""
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr ""
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+"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 ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
 msgstr ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
 msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
 msgstr ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
 msgstr ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: umbrelloui.rc:35
+#, no-c-format
+msgid "&Zoom"
 msgstr ""
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
 msgstr ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
 msgstr ""
 
-#: aligntoolbar.cpp:383
+#: tips:3
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr ""
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+"<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 ""
 
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr ""
-
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr ""
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr ""
-
-#: model_utils.cpp:246
-msgid "new_usecase"
+"<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:248
-msgid "new_package"
-msgstr ""
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr ""
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr ""
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr ""
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr ""
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr ""
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr ""
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr ""
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr ""
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr ""
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr ""
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-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 ""
diff --git a/tde-i18n-ru/messages/tdesdk/umbrello.po b/tde-i18n-ru/messages/tdesdk/umbrello.po
index 66406e876fd..c8766673ddb 100644
--- a/tde-i18n-ru/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ru/messages/tdesdk/umbrello.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-01-15 11:05+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -15,248 +15,206 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Генератор кода Umbrello"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Файл для преобразования"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Файл XSLT"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Гаэль де Шалендар (Gael de Chalendar) aka Kleag, (c) 2002-2006 Авторы "
-"Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Авторы Umbrello"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Николай Шафоростов"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Экспорт всех представлений..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "shafff@ukr.net"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "При экспортировании изображений произошли ошибки:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "Ошибка при сохранении файла: %1"
+#: 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/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 "Ошибка сохранения"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Выровнять по левому краю"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Объект"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Выровнять по правому краю"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Синхронное сообщение"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Выровнять по верхнему краю"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Асинхронное сообщение"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Выровнять по нижнему краю"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Ассоциация"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Выровнять вертикально (посередине)"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Вместимость"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Выровнять горизонтально (посредине)"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ссылка"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Выровнять вертикально (по краям)"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Надпись"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Выровнять горизонтально (по краям)"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Примечание"
+#: 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:253
-msgid "Box"
-msgstr "Блок"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Оформление"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Действующее лицо"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Зависимость"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Обобщение"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Агрегирование"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Отношение"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Прямая ассоциация"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Реализует (обобщение и реализация)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Композиция"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "Класс"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Начальное состояние"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Конечное состояние"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Разделить или объединить"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Отделить или присоединить"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Пакет"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Компонент"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Узел"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Зависимость"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Артефакт"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Ассоциация"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Интерфейс"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Самоассоциация"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Тип данных"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Сообщение кооперации"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Перечисляемый тип"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Синхронное сообщение"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Сущность"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Самосообщение кооперации"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Глубже"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Синхронное самосообщение"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Выше"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Вместимость"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Присоединение"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Композиция"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Отделение"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Реализация"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Сочетание"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Уни-ассоциация"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Выбор"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ссылка"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Переход состояния"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Переход деятельности"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Виды деятельности"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Состояние"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Множественность"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Конечная деятельность"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Введите множественность:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Начальная деятельность"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Имя ассоциации"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Сообщение"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Введите имя ассоциации:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "UNDEFINED"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Имя роли"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Выделение"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Введите имя роли:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Неверное имя."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Неверное имя"
+
+#: 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 "Имя уже используется."
+
+#: 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 "Имя уже используется"
 
 #: 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."
+"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 ""
 "К минимум один из элементов, содержащихся в буфере обмена, не может быть "
 "вставлен из-за конфликта имён. Остальные элементы вставлены."
@@ -270,18 +228,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Невозможно открыть файл %1 для записи. Убедитесь, что папка существует и у вас "
-"есть права записи в неё."
+"Невозможно открыть файл %1 для записи. Убедитесь, что папка существует и у "
+"вас есть права записи в неё."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Невозможно открыть файл"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Невозможно создать папку:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Невозможно создать папку:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1340 +251,1516 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Невозможно создать папку"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Введите имя состояния"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Общие параметры"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Введите имя нового состояния:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Пакет является пространством имён"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Введите деятельность"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Виртуальные деструкторы"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Введите имя новой деятельности:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Генерировать пустые конструкторы"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "новая деятельность"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Генерировать методы доступа к атрибутам"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Модель UML"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Встраиваемые операции"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Логическое представление"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Встраиваемые методы доступа к атрибутам"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Прецеденты"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Открытые методы доступа к атрибутам"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Компоненты"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Импортирование файла: %1 Выполнено: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Развёртывание"
+#: 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 "Готово."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Отношения"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Область видимости %1 ограничивается пространством имён или классом?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Типы данных"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Импорт в C++ требует вашего вмешательства"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Текущий файл был изменён.\n"
-"Сохранить его?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Пространство имён"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Файл %1 не существует."
+#: 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 "Класс"
 
-#: 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 "Ошибка загрузки"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Внутренняя ошибка"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Файл %1 повреждён."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Синтаксическая ошибка перед '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Сжатый файл %1 не содержит XMI."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Ошибка грамматического разбора перед '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Ошибка при загрузке распакованного файла: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Ошибка при загрузке файла: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "ожидается выражение"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Ошибка при закачке файла на сервер: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Ошибка в синтаксисе объявления"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "Диаграмма прецедентов"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} ожидалось"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Диаграмма классов"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "пространство имён ожидалось"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "Диаграмма последовательности"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ ожидалось"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "Диаграмма кооперации"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Ожидается имя пространства имён"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "Диаграмма состояний"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Необходим спецификатор типа для объявления"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "Диаграмма деятельности"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "ожидается объявление"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "Диаграмма компонентов"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Ожидалось константное выражение"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "Диаграмма развёртывания"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' ожидалось"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "Диаграмма отношений сущностей"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "Имя"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "Введите имя:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Ожидался спецификатор базового класса"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Недопустимое имя диаграммы."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Ожидается конструкция инициализации"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Неверное имя"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Ожидается идентификатор"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Диаграмма уже использует это имя."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "Имя уже используется"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "Неверное имя."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "Имя уже используется."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "ожидается выражение"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Такое имя уже существует.\n"
-"Вы хотите именно это?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "ожидается инициализация for"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Имя существует"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "ожидается catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Использовать указанное имя"
+#: 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 "С&войства"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Введите новое имя"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Начальная деятельность"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Удалить '%1'?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Конечная деятельность"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Удалить диаграмму"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Разделить или объединить"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Построение документа..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Отделить или присоединить"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Разрешение ссылок на объекты..."
+#: 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 "Общие"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Загрузка элементов UML..."
+#: 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 "Общие параметры"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Загрузка диаграмм..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Тип деятельности:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Имя деятельности:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Документация"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "Шрифт:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "Настройки шрифтов"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "Цвет"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Представления"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Цвета"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Указанное имя недопустимо\n"
-"Создание отменено."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Деятельности"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Неправильное имя"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Новая деятельность..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Указанное имя уже используется\n"
-"Создание отменено."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Удалить ссылку"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Создание отменено"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Переименовать"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Загрузка списка..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Новая деятельность"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Удаляемая папка должна быть пустой."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "новая деятельность"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Папка не пуста"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Переименовать деятельность"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "Операция с таким же именем и сигнатурой уже существует."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Введите новое имя деятельности:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Введите имя деятельности"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Имя:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "новое состояние"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Тип:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Обобщение"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Ассоциации"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Самоассоциация"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Свойства ассоциации"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "Общие настройки"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Синхронное сообщение"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Роли"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Самосообщение кооперации"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Конфигурация ролей"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Синхронное самосообщение"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Шрифт ассоциации"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Реализация"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Свойства роли A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Уни-ассоциация"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Свойства роли B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Экспорт"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Видимость роли A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Диаграмма"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Видимость роли B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Создать"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Возможность изменения роли A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Показать"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Возможность изменения роли B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Код"
+msgid "Rolename:"
+msgstr "Имя роли:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Текущий &язык"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "Документация"
+msgid "Public"
+msgstr "Публичный"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Слеш-Слеш (//)"
+msgid "Private"
+msgstr "Приватный"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Слеш-Звёздочка (/**  */)"
+msgid "Protected"
+msgstr "Защищённый"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Стиль:"
+msgid "Implementation"
+msgstr "Реализация"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Генерация кода C++</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Общие"
+msgid "Frozen"
+msgstr "Нет"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Генерация тела метода"
+msgid "Add only"
+msgstr "Только добавление"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Использовать следующие классы при генерации кода:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Имя класса:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "&Имя действующего лица:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Имя пакета:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Переменная</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Имя прецедента:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Имя интерфейса:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Имя компонента:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Имя артефакта:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "&Имя перечисляемого типа:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Имя типа данных:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Имя су&щности:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Имя &стереотипа:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Имя пакета:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Имя класса"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "&Абстрактный класс"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Включить файл</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "&Абстрактный прецедент"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Генерация проекта"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Командный файл"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Создать сборочный файл ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Показывать как"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Генерировать методы автоматически"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&По умолчанию"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Пустые конструкторы"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Фон:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Методы доступа к ассоциации"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Библиотека"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Методы доступа к атрибутам"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+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 "Публичный"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+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 "Приватный"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+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 "Защищённый"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&Приватный"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "От родительского объекта"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&Защищён"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Область видимости методов доступа к атрибутам по умолчанию:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "&Реализация"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Область видимости полей ассоциации по умолчанию:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Имя класса:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "От родительской роли"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Имя экземпляра:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Генерирование кода на Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Рисовать как действующее лицо"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Диез (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Несколько экземпляров"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Начало-конец (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Показать деструкцию"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Генерация кода Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Имя компонента:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Имя узла:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
+msgstr ""
+"Это имя уже используется.\n"
+"Оно сброшено."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Имя уже существует"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Атрибуты"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Создать атрибут..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Операции"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "&Создать операцию..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Шаблоны"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "&Создать шаблон..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Перечисляемые константы"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "&Добавить перечисляемую константу..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Атрибуты сущности"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "&Создать атрибут сущности..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Удалить ссылку"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "С&войства"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Показать"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Операции"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Видимость"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Сигнатура &операции"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Пакет"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&Атрибуты"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Стереотип"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "&Сигнатура атрибута"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Рисовать как окружность"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Отображение"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Параметры отображения"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Атрибуты"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Операции"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Шаблоны"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Конфигурация перечисляемых констант"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Атрибуты сущности"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Вместимость"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Содержание"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Классовые ассоциации"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "new_class"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Новый класс"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Классовые атрибуты"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Операции класса"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Параметры генерации кода"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Язык"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Генерировать"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Папки"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Готово"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Сохранять сгенерированные файлы в папку:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Код сгенерирован"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Обзор..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Не сгенерирован"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "О&бзор..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ещё не сгенерирован"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Подключать заголовочные файлы из папки:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Папка %1 не существует. Создать её?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Сгенерированные файлы будут сохранены в этой папке"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Папка вывода не существует"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Создать папку"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Не создавать"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Файлы из этой папки будут использоваться как заголовочные при генерации кода"
+"Невозможно создать папку.\n"
+"Убедитесь, что у вас есть права на запись на родительской папке или выберите "
+"другую папку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Существующие файлы"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Ошибка создания папки"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Выберите допустимую папку."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Если файл с именем, которое будет использовано\n"
-"генератором кода, уже существует:"
+"Конечная папка существует, но у вас отсутствуют права на запись в неё.\n"
+"Измените права или папку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Заменять"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "Заменять существующие файлы"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 не является папкой. Выберите другую папку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Спросить"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Выберите допустимую папку"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Если файл с таким именем уже существует, спросить о дальнейших действиях"
+msgid "Code Viewer"
+msgstr "Просмотр кода"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Выбрать другое имя"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Нет доступных параметров.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Диаграммы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Оформление"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Фильтр"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Строки"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Текущая диаграмма"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Конец строки:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Все диаграммы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Тип отступов:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Выделить диаграммы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Количество символов:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Тип диаграммы"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"Unix (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Выделение"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Прецедент"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Кооперация"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Последовательность"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Состояние"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Компонент"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Развёртывание"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Нет выбранных диаграмм."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Формат, в котором изображения были экспортированы в"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Примечание"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Конечный файл уже существует"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Файл %1 уже существует в %2.\n"
+"\n"
+"Вы можете заменить его, сохранить файл под другим именем, или не "
+"генерировать его вообще."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Применить к остальным файлам"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Без отступов"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Заменить"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Табуляция"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Предложить похожее имя"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Пробел"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Не генерировать файл"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Подробность комментариев"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+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"
-msgstr "Вставлять комментарии &для секций даже если они пусты"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Тип:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Имя:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Начальное значение:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Направление передачи"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Вставлять комментарии с названиями секций (открытые, приватные...) в "
-"определении класса даже если нет элементов в этих секциях"
+"\"in\" - параметр только для чтения, \"out\" - параметр только для записи и "
+"\"inout\" - параметр как для чтения, так и для записи."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Вставлять комментарии в документацию даже если они пустые"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr "Вставлять комментарии для &классов и методов даже если они пустые"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Выберите операцию"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Языки программирования"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Номер следования:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Мастер генерации кода"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Классовая операция:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Выберите классы"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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:30
+msgid "Umbrello Setup"
+msgstr "Настройка Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Интерфейс"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Пользовательский интерфейс"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Цвет линии:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Цвет по умолчанию"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Цвет фона:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Ц&вет по умолчанию"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Ширина строки:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "&Ширина по умолчанию"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Непрозрачный фон"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Поместите классы, для которых вы хотите сгенерировать код,\n"
-"в список справа"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Добавить класс для генерации кода"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Включить запись действий для отмены"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Выбранные классы"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Использовать вкладки"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Удалить класс из генерирования кода"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Использовать новые генераторы классов C++, Java и Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Доступные классы"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Использовать ломаные соединительные линии"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Состояние генерации кода"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Автосохранение"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Нажмите кнопку для запуска генерирования кода"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Включить автосохранение"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Состояние генерации"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Интервал автосохранения, мин:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Просмотр кода"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Расширение автосохранения:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Отображать скрытые блоки"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Если при автосохранении имя нового файла не задано, будет использован "
+"файл ~/autosave.xmi.</p><p>Если файл уже был сохранён, файл автосохранения "
+"будет иметь такое же полное имя, как и редактируемый, только с указанными "
+"суффиксом в конце.</p><p>Если указанный суффикс равен суффиксу "
+"редактируемого файла, при автосохранении он будет перезаписываться "
+"автоматически.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">здесь имя компонента</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Запуск приложения"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Отображать тип блока"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Показывать з&аставку"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Цвета"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Совет дня"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Шрифт:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Открыть последний проект"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Бумага:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Диаграмма по умолчанию для нового проекта:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Выделение:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Пустой"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Блок объекта UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Диаграмма класса"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Скрытый блок:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Диаграмма прецедентов"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Неизменяемый текст:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Диаграмма последовательностей"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Изменяемый текст:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Диаграмма кооперации"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Параметры диаграммы"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Диаграмма состояний"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Имя:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Диаграмма деятельности"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Масштаб:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Диаграмма компонентов"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Диаграмма развёртки"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Параметры класса"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Показать &видимость"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Показать атрибуты"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Показать операции"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Показать &стереотип"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Показать сигнатуру атрибута"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Показать пакет"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Показать сигнатуру операции"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "&Сетка"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Начальная область видимости"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Привязать &к сетке"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Область видимости атрибутов по умолчанию"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Привязать размер компонентов"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Область видимости операций по умолчанию"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Генерация кода"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Генерация кода"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Просмотр кода"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Начальное состояние"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Конечное состояние"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Тип состояния:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Имя состояния:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Цвет элемента"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Свойства атрибута"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "&Область видимости классификатора (\"static\")"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Публичный"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Защищён"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "&Реализация"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Вы ввели недопустимое имя атрибута."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Имя атрибута недопустимо"
+
+#: dialogs/umlattributedialog.cpp:163
 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 ""
-"Привязать размер компонентов к шагу сетки.\n"
-"Если включен параметр \"Привязать к сетке\", все четыре стороны компонента "
-"будут располагаться по сетке."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Такое имя атрибута уже используется."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Интервал сетки:  "
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Имя атрибута уже используется"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Свойства атрибута сущности"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Значение по умолчанию:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Ширина строки:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Длина/Значения:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Экспортировать все представления"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Авто-инкремент"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Каталог для сохранения диаграмм:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Разрешить &null"
 
-#. 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"
-msgstr "Каталог для изображений"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Атрибуты:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Тип изображения:"
+#: 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"
-msgstr "Формат, в котором изображения были экспортированы в"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Отключено"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Использовать &папки"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Первичное"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Индекс"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Уникальное"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Вы ввели недопустимое имя атрибута сущности."
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Имя атрибута сущности недопустимо"
+
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr "Создать такую же иерархию папок на диске, что и иерархия в документе"
+"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 "&Запрос (\"const\")"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Параметры"
+
+#: 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 ""
-"Представления хранятся в \"папках\" документа. Аналогичное дерево каталогов "
-"можно создать и на диске в выбранной базовой папкой.\n"
-"В неё будут помещены только папки, созданные пользователем (т.е. без "
-"логического представления, представления прецедентов и т.д.)."
+"Выбранное имя параметра уже\n"
+"используется в этой операции."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Имя параметра не уникально"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Указанное имя параметра уже используется в этой операции."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Недопустимое имя операции."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Недопустимое имя операции"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Операция с такой же сигнатурой уже существует в %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Выберите другое имя или набор параметров."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "Свойства ролей"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Имя роли:"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Свойства шаблона"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Множественность:"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Неверное имя шаблона."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Возможность изменения роли"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template 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"
-msgstr "Только добавление"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Указанное имя параметра шаблона уже используется в этой операции."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Нет"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Имя параметра шаблона не уникально"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Возможность изменения"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Параметры отображения классов"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Видимость роли"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Цвета диаграмм"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Реализация"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+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"
-msgstr ""
-"<p>Добро пожаловать в Umbrello.</p>\n"
-"<p>С помощью UML-диаграмм вы сможете спроектировать и документировать "
-"объектно-ориентированное програмное обеспечение.  <a href=\"help:/umbrello\">"
-"Руководство Umbrello</a> также содержит краткое введение в UML.</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Такое имя уже существует."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Добро пожаловать в 1.5.  В этой версии добавлена поддержка ассоциаций, "
-"генератор кода Ruby, возможность преобразовывать интерфейсы в классы и не "
-"только.</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:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Невозможно одновременно использовать диаграммы во вкладках и внешние папки. "
-"Если вы хотите использовать внешние папки, отключите параметр \"Использовать "
-"вкладки\".</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Линия:"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Размер большинства элементов диаграмм нельзя изменить вручную, это будет "
-"происходить автоматически при необходимости чтобы вместить содержание.\n"
-"Размер блоков, примечаний и сообщений диаграмм последовательностей изменить "
-"можно, с помощью красного квадратика.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Фон:"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Если вы хотите добавить существующий класс в диаграмму, просто перенесите "
-"его из дерева классов слева.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&По умолчанию"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Утилита реорганизации позволяет вам перемещать операции между классами и их "
-"потомками/родителями.\n"
-"Её можно вызвать из контекстного меню класса.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Непрозрачный фон"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Объекты диаграмм последовательности могут иметь блок деструктора и "
-"рисоваться в виде действующих лиц. Двойной щелчок приведёт к открытию "
-"свойств.</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Экспорт всех представлений..."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Сообщения диаграммы последовательностей могут выполнять роль конструкторов. "
-"Щёлкните на объекте чтобы сделать его конструктором.</p>\n"
+#: 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:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Диаграммы последовательностей поддерживают посылку сообщений самим себе. "
-"Щёлкните на той же вертикальной линии чтобы создать автосообщение.</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 "Ошибка при сохранении файла: %1"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Если при загрузке внешнего файла список пуст, \n"
-"попробуйте сохранить модель под другим именем, \n"
-"закройте и попробуйте снова открыть сохранённый файл.\n"
-"</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 "Ошибка сохранения"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>При копировании или вырезании в буфер обмена также копируется "
-"PNG-изображение диаграммы, которое можно вставить в KWord и другие "
-"приложения.</p>\n"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Генератор кода Umbrello"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Ассоциации не обязательно должны быть прямыми линиями. Щёлкните на ней и "
-"создастся передвигаемая точка.</p>\n"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Файл для преобразования"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Вы можете включить автосохранение в настройках Umbrello.</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Файл XSLT"
 
-#: 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 ""
-"<p>Вам чего-то не хватает в  Umbrello? Дайте нам знать об этом. \n"
-"Сообщите о нём через систему отслеживания ошибок (\"Сообщить об ошибке\" в меню "
-"\"Справка\", или через список рассылки uml-devel.</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"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Вы можете удалить все выделенные объекты нажатием Del или Backspace.</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Авторы Umbrello"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Если вы обнаружили ошибку в Umbrello, сообщите нам о ней. \n"
-"Для этого можете воспользоваться соответствующим пунктом в меню Справка.</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 "Имя"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>При нажатии Escape активируется средство выделения.\n"
-"А при нажатии Backspace активируется средство, использовавшееся до этого.</p>\n"
+#: 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 "Введите имя:"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Чтобы выделить все объекты, нажмите Ctrl-A.</p>\n"
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Введите имя операции:"
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Вы можете создать новый класс с помощью мастера новых классов в меню Код.</p>"
-"\n"
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Введите новый текст:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ОШИБКА"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Изменить текст"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Файл папки %1 не существует."
+
+#: 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 "Ошибка загрузки"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Не удалось открыть файл папки %1."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1682,6 +1814,10 @@ msgstr "Новая операция..."
 msgid "Select Operation..."
 msgstr "Выбрать операцию..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Изменить текст..."
@@ -1733,6 +1869,19 @@ msgstr "Создать"
 msgid "Rename..."
 msgstr "Переименовать..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Ошибка вставки"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Цвет строки..."
@@ -1761,14 +1910,26 @@ msgstr "Сделать папку внутренней"
 msgid "Import Classes..."
 msgstr "Импортировать классы..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Пакет"
+
 #: 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 "Узел"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Диаграмма развёртывания..."
@@ -1777,10 +1938,18 @@ msgstr "Диаграмма развёртывания..."
 msgid "Folder"
 msgstr "Папка"
 
+#: 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 "Диаграмма прецедентов..."
@@ -1817,6 +1986,18 @@ msgstr "Новый атрибут сущности..."
 msgid "Export as Picture..."
 msgstr "Сохранить как изображение..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: 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 "Диаграмма классов..."
@@ -1837,26 +2018,10 @@ msgstr "Диаграмма последовательностей..."
 msgid "Collaboration Diagram..."
 msgstr "Диаграмма кооперации..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Атрибуты"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Операции"
-
 #: 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 "Сигнатура операции"
@@ -1869,11 +2034,6 @@ msgstr "Сигнатура атрибута"
 msgid "Stereotype"
 msgstr "Стереотип"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Показать"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Атрибут..."
@@ -1898,14 +2058,6 @@ msgstr "Цвет фона..."
 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 "Цвет"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Действующее лицо..."
@@ -1934,10 +2086,26 @@ msgstr "Перечисляемый тип..."
 msgid "Package..."
 msgstr "Пакет..."
 
+#: 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 "Состояние..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Начальная деятельность"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Конечная деятельность"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Подсистема..."
@@ -1982,6 +2150,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 "Очистить диаграмму"
@@ -2016,198 +2192,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 "(c) 2001 Пауль Хенсген (Paul Hensgen), (c) 2002-2006 Авторы Umbrello"
 
-#: 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 "Файл папки %1 не существует."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Не удалось открыть файл папки %1."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Николай Шафоростов"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "shafff@ukr.net"
-
-#: 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 "Готово."
-
-#: 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 ""
-"Зажмите Shift или Ctrl для перемещения оси по X. Зажмите Shift и Ctrl "
-"перемещения по оси Y. Щёлкните правой кнопкой мыши для отмены перемещения."
-
-#: 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 ""
-"Зажмите Shift или Ctrl для перемещения оси по X. Зажмите Shift и Ctrl "
-"перемещения по оси Y. Щёлкните правой кнопкой мыши для отмены изменения "
-"размера."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Область видимости %1 ограничивается пространством имён или классом?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Импорт в C++ требует вашего вмешательства"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Пространство имён"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Импортирование файла: %1 Выполнено: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Внутренняя ошибка"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Синтаксическая ошибка перед '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Ошибка грамматического разбора перед '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "new_actor"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "ожидается выражение"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "new_usecase"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Ошибка в синтаксисе объявления"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "new_package"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} ожидалось"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "new_component"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "пространство имён ожидалось"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "new_node"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ ожидалось"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "new_artifact"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Ожидается имя пространства имён"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "new_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Необходим спецификатор типа для объявления"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "new_datatype"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "ожидается объявление"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "new_enum"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Ожидалось константное выражение"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "new_entity"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' ожидалось"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "new_folder"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} пропущено"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "new_association"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Ожидались инициализаторы членов"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "new_object"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Ожидался спецификатор базового класса"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Ожидается конструкция инициализации"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Пусто"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Ожидается идентификатор"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Недопустимый аргумент"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Ожидается идентификатор типа"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Неизвестный тип аргумента"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Ожидалось имя класса"
+#: 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"
-msgstr "ожидается условное выражение"
+#: 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"
-msgstr "ожидается выражение"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Неопределённая ошибка"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "ожидается инициализация for"
+#: 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"
-msgstr "ожидается catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Зарезервированное ключевое слово"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2221,103 +2301,66 @@ msgstr "Введите имя объекта:"
 msgid "new_parameter"
 msgstr "new_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Общие параметры"
-
-#: 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"
-msgstr "Диаграмма: %2 Страница %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Введите имя диаграммы"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Добавить базовый класс"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Введите новое имя диаграммы:"
+#: 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?"
-msgstr "Удалить диаграмму целиком?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Добавить операцию"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Удалить диаграмму?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Добавить атрибут"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Переименование отменено"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Добавить базовый интерфейс"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Переименование записи типа %1 в списке не поддерживается."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Добавить наследующий интерфейс"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Функция не реализована"
+#: 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."
-msgstr ""
-"Указанное имя недопустимо.\n"
-"Переименование отменено."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Производные классификаторы"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "new_association"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Введите имя состояния"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "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"
-msgstr "new_template"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Введите деятельность"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "new_operation"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Недопустимое использование ассоциаций."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "new_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Ошибка ассоциации"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "new_field"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "новое состояние"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2471,11 +2514,6 @@ msgstr "&Экспортировать в изображение..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Экспортировать &все диаграммы в виде изображений..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "С&войства"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Ползунок масштаба"
@@ -2560,21 +2598,28 @@ msgstr "&Документация"
 msgid "Opening file..."
 msgstr "Открытие файла..."
 
+#: 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 "Создание нового документа..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Все поддерживаемые форматы (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Все поддерживаемые форматы (*.xmi, *.xmi."
+"tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Несжатые файлы XMI(*.xmi)\n"
 "*.xmi.tgz|Сжатые Gzip файлы XMI (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Сжатые Bzip2 файлы XMI (*.xmi.tar.bz2)\n"
@@ -2604,6 +2649,10 @@ msgstr ""
 "*.xmi.tar.bz2|Сжатый Bzip2 файл XMI (*.xmi.tar.bz2)\n"
 "*|Все файлы"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2612,6 +2661,10 @@ msgstr ""
 "Файл %1 уже существует.\n"
 "Заменить его?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Заменить"
@@ -2647,8 +2700,8 @@ msgstr "Вставка содержимого буфера обмена..."
 
 #: 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 ""
 "Невозможно вставить содержимое буфера обмена. Возможно объекты имеют "
 "недопустимый тип."
@@ -2706,1258 +2759,1304 @@ msgstr "Все файлы"
 msgid "Select Code to Import"
 msgstr "Выберите код для импорта"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Имя класса:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "&Имя действующего лица:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "new_attribute"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Имя пакета:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Имя прецедента:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "new_operation"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Имя интерфейса:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "new_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Имя компонента:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "new_field"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Имя артефакта:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Модель UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "&Имя перечисляемого типа:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Логическое представление"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Имя типа данных:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Прецеденты"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Имя су&щности:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Компоненты"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Имя &стереотипа:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Развёртывание"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Имя пакета:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Отношения"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "&Абстрактный класс"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Типы данных"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "&Абстрактный прецедент"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Текущий файл был изменён.\n"
+"Сохранить его?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Командный файл"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Файл %1 не существует."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Показывать как"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Файл %1 повреждён."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&По умолчанию"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Сжатый файл %1 не содержит XMI."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Библиотека"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Ошибка при загрузке распакованного файла: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Таблица"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Ошибка при загрузке файла: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Публичный"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Ошибка при закачке файла на сервер: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&Приватный"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "Диаграмма прецедентов"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&Защищён"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Диаграмма классов"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "&Реализация"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "Диаграмма последовательности"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Имя класса:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "Диаграмма кооперации"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Имя экземпляра:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "Диаграмма состояний"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Рисовать как действующее лицо"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "Диаграмма деятельности"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Несколько экземпляров"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "Диаграмма компонентов"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Показать деструкцию"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "Диаграмма развёртывания"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Имя компонента:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "Диаграмма отношений сущностей"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Имя узла:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Недопустимое имя диаграммы."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Имя стереотипа:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Диаграмма уже использует это имя."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Это имя уже используется.\n"
-"Оно сброшено."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Имя уже существует"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Линия:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Фон:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&По умолчанию"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Непрозрачный фон"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Деятельности"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Новая деятельность..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Переименовать"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Новая деятельность"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Переименовать деятельность"
+"Такое имя уже существует.\n"
+"Вы хотите именно это?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Введите новое имя деятельности:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Использовать указанное имя"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Свойства ассоциации"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+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 "Общие настройки"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Удалить '%1'?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Роли"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Удалить диаграмму"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Конфигурация ролей"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+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 "Настройки шрифтов"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Разрешение ссылок на объекты..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Шрифт ассоциации"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Загрузка элементов UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Свойства шаблона"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+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 "Общие параметры"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Тип:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Сделать папку внешней"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Имя:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Введите имя модели"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Неверное имя шаблона."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Введите новое имя модели:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Неверное имя шаблона"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Представления"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Указанное имя параметра шаблона уже используется в этой операции."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Имя параметра шаблона не уникально"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Указанное имя недопустимо\n"
+"Создание отменено."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Свойства атрибута сущности"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Неправильное имя"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Значение по умолчанию:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Указанное имя уже используется\n"
+"Создание отменено."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Длина/Значения:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Создание отменено"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Авто-инкремент"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Загрузка списка..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Разрешить &null"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Удаляемая папка должна быть пустой."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Атрибуты:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Папка не пуста"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Индексирование"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Переименование отменено"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Отключено"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Переименование записи типа %1 в списке не поддерживается."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Первичное"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Функция не реализована"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Индекс"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Указанное имя недопустимо.\n"
+"Переименование отменено."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Уникальное"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Диаграмма: %2 Страница %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Вы ввели недопустимое имя атрибута сущности."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Введите имя диаграммы"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Имя атрибута сущности недопустимо"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Введите новое имя диаграммы:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Такое имя атрибута сущности уже используется в этой операции."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Имя атрибута сущности уже используется"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Отображение"
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr "Удалить диаграмму целиком?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Параметры отображения классов"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Удалить диаграмму?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Цвета диаграмм"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Экспорт представления..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Указано неправильное имя."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "При экспортировании изображения произошла ошибка:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Такое имя уже существует."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Выбранный файл %1 уже существует.\n"
+"Заменить его?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Тип:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Файл уже существует"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Настройка Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Невозможно создать папку: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Интерфейс"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Диаграмма пуста"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Пользовательский интерфейс"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "При сохранении диаграммы в %1 произошла ошибка"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Цвет линии:"
+#: 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 ""
+"Зажмите Shift или Ctrl для перемещения оси по X. Зажмите Shift и Ctrl "
+"перемещения по оси Y. Щёлкните правой кнопкой мыши для отмены перемещения."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-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 ""
+"Зажмите Shift или Ctrl для перемещения оси по X. Зажмите Shift и Ctrl "
+"перемещения по оси Y. Щёлкните правой кнопкой мыши для отмены изменения "
+"размера."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Цвет фона:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Объект"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Ц&вет по умолчанию"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Синхронное сообщение"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Ширина строки:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Асинхронное сообщение"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "&Ширина по умолчанию"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Надпись"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Непрозрачный фон"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Примечание"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Включить запись действий для отмены"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Блок"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Использовать вкладки"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Отношение"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Использовать новые генераторы классов C++, Java и Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Прямая ассоциация"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Использовать ломаные соединительные линии"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Реализует (обобщение и реализация)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Автосохранение"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Глубже"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Включить автосохранение"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Выше"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Интервал автосохранения, мин:"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Присоединение"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Расширение автосохранения:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Отделение"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Если при автосохранении имя нового файла не задано, будет использован файл "
-"~/autosave.xmi.</p>"
-"<p>Если файл уже был сохранён, файл автосохранения будет иметь такое же полное "
-"имя, как и редактируемый, только с указанными суффиксом в конце.</p>"
-"<p>Если указанный суффикс равен суффиксу редактируемого файла, при "
-"автосохранении он будет перезаписываться автоматически.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Сочетание"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Запуск приложения"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Выбор"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Показывать з&аставку"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Переход деятельности"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Совет дня"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Сообщение"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Открыть последний проект"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "UNDEFINED"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Диаграмма по умолчанию для нового проекта:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Выделение"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Пустой"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Диаграмма класса"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Диаграмма прецедентов"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Диаграмма последовательностей"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Диаграмма кооперации"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Показать операции"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Диаграмма состояний"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Диаграмма деятельности"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Очистить диаграмму"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Диаграмма компонентов"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Диаграмма развёртки"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Обобщение"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Параметры класса"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Показать &видимость"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Показать атрибуты"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Имя ассоциации"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Показать операции"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Показать &стереотип"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Показать сигнатуру атрибута"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Показать пакет"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&По умолчанию"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Начальная область видимости"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Область видимости атрибутов по умолчанию"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Слеш-Слеш (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Область видимости операций по умолчанию"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Слеш-Звёздочка (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Генерация кода"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Стиль:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Генерация кода"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Генерация кода C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Просмотр кода"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Генерация тела метода"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Свойства операции"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Использовать следующие классы при генерации кода:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Абстрактная операция"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "&Область видимости классификатора (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Запрос (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Переменная</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Защищён"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "&Реализация"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Параметры"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Создать параметр..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Неправильное имя параметра."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">List</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Неправильное имя параметра"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Выбранное имя параметра уже\n"
-"используется в этой операции."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Имя параметра не уникально"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Указанное имя параметра уже используется в этой операции."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Имя класса"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Недопустимое имя операции."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Включить файл</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Недопустимое имя операции"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Генерация проекта"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Операция с такой же сигнатурой уже существует в %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Создать сборочный файл ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Выберите другое имя или набор параметров."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Генерировать методы автоматически"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Свойства роли A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Пустые конструкторы"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Свойства роли B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Методы доступа к ассоциации"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Видимость роли A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Методы доступа к атрибутам"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Видимость роли B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "От родительского объекта"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Возможность изменения роли A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Область видимости методов доступа к атрибутам по умолчанию:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Возможность изменения роли B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Область видимости полей ассоциации по умолчанию:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Содержимое"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "От родительской роли"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Примечание"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Генерирование кода на Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Создать атрибут..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Диез (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "&Создать операцию..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Начало-конец (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Шаблоны"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Генерация кода Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "&Создать шаблон..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Язык"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Перечисляемые константы"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Папки"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "&Добавить перечисляемую константу..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Сохранять сгенерированные файлы в папку:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Атрибуты сущности"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Обзор..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "&Создать атрибут сущности..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "О&бзор..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Начальная деятельность"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Подключать заголовочные файлы из папки:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Конечная деятельность"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Сгенерированные файлы будут сохранены в этой папке"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Тип деятельности:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Файлы из этой папки будут использоваться как заголовочные при генерации кода"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Имя деятельности:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Существующие файлы"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Цвета"
+#: 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 ""
+"Если файл с именем, которое будет использовано\n"
+"генератором кода, уже существует:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Свойства атрибута"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Заменять"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Начальное значение:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Заменять существующие файлы"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Публичный"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Спросить"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Вы ввели недопустимое имя атрибута."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Если файл с таким именем уже существует, спросить о дальнейших действиях"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Имя атрибута недопустимо"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Выбрать другое имя"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Такое имя атрибута уже используется."
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Имя атрибута уже используется"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Оформление"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Выберите операцию"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Строки"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Номер следования:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Конец строки:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Классовая операция:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Тип отступов:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Другое действие:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Количество символов:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Диаграммы"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "Unix (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Фильтр"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Текущая диаграмма"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Все диаграммы"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Без отступов"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Выделить диаграммы"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Табуляция"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Тип диаграммы"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Пробел"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Выделение"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Подробность комментариев"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Кооперация"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Вставлять комментарии &для секций даже если они пусты"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Последовательность"
+#: 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Развёртывание"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Вставлять комментарии в документацию даже если они пустые"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Нет выбранных диаграмм."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Вставлять комментарии для &классов и методов даже если они пустые"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Параметры отображения"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Языки программирования"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Атрибуты"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Мастер генерации кода"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Операции"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Выберите классы"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Шаблоны"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Поместите классы, для которых вы хотите сгенерировать код,\n"
+"в список справа"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Конфигурация перечисляемых констант"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Добавить класс для генерации кода"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Атрибуты сущности"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Выбранные классы"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Содержание"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Удалить класс из генерирования кода"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Ассоциации"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Доступные классы"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Классовые ассоциации"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Состояние генерации кода"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Операции"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Нажмите кнопку для запуска генерирования кода"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Видимость"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Состояние генерации"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Сигнатура &операции"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Отображать скрытые блоки"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Пакет"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">здесь имя компонента</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&Атрибуты"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Стереотип"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Отображать тип блока"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "&Сигнатура атрибута"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Цвета"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Рисовать как окружность"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Шрифт:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Начальное состояние"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Бумага:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Конечное состояние"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Выделение:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Тип состояния:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Блок объекта UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Имя состояния:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Скрытый блок:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Цвет элемента"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Неизменяемый текст:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "new_class"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Изменяемый текст:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Новый класс"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Параметры диаграммы"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Классовые атрибуты"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Масштаб:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Операции класса"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Свойства параметра"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "&Сетка"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Направление передачи"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Привязать &к сетке"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Привязать размер компонентов"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" - параметр только для чтения, \"out\" - параметр только для записи и "
-"\"inout\" - параметр как для чтения, так и для записи."
+"Привязать размер компонентов к шагу сетки.\n"
+"Если включен параметр \"Привязать к сетке\", все четыре стороны компонента "
+"будут располагаться по сетке."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Генерировать"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Интервал сетки:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Готово"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Код сгенерирован"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Не сгенерирован"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Ширина строки:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ещё не сгенерирован"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Экспортировать все представления"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Папка %1 не существует. Создать её?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Каталог для сохранения диаграмм:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Папка вывода не существует"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Каталог для изображений"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Создать папку"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Тип изображения:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Не создавать"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Использовать &папки"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
-msgstr ""
-"Невозможно создать папку.\n"
-"Убедитесь, что у вас есть права на запись на родительской папке или выберите "
-"другую папку."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Ошибка создания папки"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Выберите допустимую папку."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr "Создать такую же иерархию папок на диске, что и иерархия в документе"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Конечная папка существует, но у вас отсутствуют права на запись в неё.\n"
-"Измените права или папку."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Ошибка записи в папку вывода"
+"Представления хранятся в \"папках\" документа. Аналогичное дерево каталогов "
+"можно создать и на диске в выбранной базовой папкой.\n"
+"В неё будут помещены только папки, созданные пользователем (т.е. без "
+"логического представления, представления прецедентов и т.д.)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 не является папкой. Выберите другую папку."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Возможность изменения роли"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Выберите допустимую папку"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Видимость роли"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Конечный файл уже существует"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Файл %1 уже существует в %2.\n"
-"\n"
-"Вы можете заменить его, сохранить файл под другим именем, или не генерировать "
-"его вообще."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Применить к остальным файлам"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Заменить"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Предложить похожее имя"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Не генерировать файл"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Нет доступных параметров.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Множественность"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Введите множественность:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Имя ассоциации"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Введите имя ассоциации:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Имя роли"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Введите имя роли:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Введите имя операции:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Введите новый текст:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ОШИБКА"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Изменить текст"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Выровнять по левому краю"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Выровнять по правому краю"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Диаграмма"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Выровнять по верхнему краю"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Создать"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Выровнять по нижнему краю"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Показать"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Выровнять вертикально (посередине)"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Масштаб:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Выровнять горизонтально (посредине)"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Код"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Выровнять вертикально (по краям)"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Текущий &язык"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Выровнять горизонтально (по краям)"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Выравнивание можно применять минимум к двум объектам, например классам или "
-"актёрам. К ассоциациям выравнивание применять невозможно."
+"<p>Добро пожаловать в Umbrello.</p>\n"
+"<p>С помощью UML-диаграмм вы сможете спроектировать и документировать "
+"объектно-ориентированное програмное обеспечение.  <a href=\"help:/umbrello"
+"\">Руководство Umbrello</a> также содержит краткое введение в UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Это зарезервированное служебное слово активного языка."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Зарезервированное ключевое слово"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Экспорт представления..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Добро пожаловать в 1.5.  В этой версии добавлена поддержка ассоциаций, "
+"генератор кода Ruby, возможность преобразовывать интерфейсы в классы и не "
+"только.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"При экспортировании изображения произошла ошибка:\n"
+"<p>Невозможно одновременно использовать диаграммы во вкладках и внешние "
+"папки. Если вы хотите использовать внешние папки, отключите параметр "
+"\"Использовать вкладки\".</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Выбранный файл %1 уже существует.\n"
-"Заменить его?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Файл уже существует"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "new_actor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "new_usecase"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "new_package"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "new_component"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "new_node"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "new_artifact"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "new_interface"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "new_datatype"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "new_enum"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "new_entity"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "new_folder"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "new_object"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Пусто"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Недопустимый аргумент"
+"<p>Размер большинства элементов диаграмм нельзя изменить вручную, это будет "
+"происходить автоматически при необходимости чтобы вместить содержание.\n"
+"Размер блоков, примечаний и сообщений диаграмм последовательностей изменить "
+"можно, с помощью красного квадратика.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Неизвестный тип аргумента"
+#: 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 ""
+"<p>Если вы хотите добавить существующий класс в диаграмму, просто перенесите "
+"его из дерева классов слева.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Недопустимое имя метода"
+#: 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 ""
+"<p>Утилита реорганизации позволяет вам перемещать операции между классами и "
+"их потомками/родителями.\n"
+"Её можно вызвать из контекстного меню класса.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Неизвестный тип возвращаемого значения"
+#: 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 ""
+"<p>Объекты диаграмм последовательности могут иметь блок деструктора и "
+"рисоваться в виде действующих лиц. Двойной щелчок приведёт к открытию "
+"свойств.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Неопределённая ошибка"
+#: 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 ""
+"<p>Сообщения диаграммы последовательностей могут выполнять роль "
+"конструкторов. Щёлкните на объекте чтобы сделать его конструктором.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Добавить базовый класс"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Диаграммы последовательностей поддерживают посылку сообщений самим себе. "
+"Щёлкните на той же вертикальной линии чтобы создать автосообщение.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Добавить наследующий класс"
+#: 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 ""
+"<p>Если при загрузке внешнего файла список пуст, \n"
+"попробуйте сохранить модель под другим именем, \n"
+"закройте и попробуйте снова открыть сохранённый файл.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Добавить операцию"
+#: 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 ""
+"<p>При копировании или вырезании в буфер обмена также копируется PNG-"
+"изображение диаграммы, которое можно вставить в KWord и другие приложения.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Добавить атрибут"
+#: 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 ""
+"<p>Ассоциации не обязательно должны быть прямыми линиями. Щёлкните на ней и "
+"создастся передвигаемая точка.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Добавить базовый интерфейс"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>Вы можете включить автосохранение в настройках Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Добавить наследующий интерфейс"
+#: 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 ""
+"<p>Вам чего-то не хватает в  Umbrello? Дайте нам знать об этом. \n"
+"Сообщите о нём через систему отслеживания ошибок (\"Сообщить об ошибке\" в "
+"меню \"Справка\", или через список рассылки uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Базовые классификаторы"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Вы можете удалить все выделенные объекты нажатием Del или Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Производные классификаторы"
+#: 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 ""
+"<p>Если вы обнаружили ошибку в Umbrello, сообщите нам о ней. \n"
+"Для этого можете воспользоваться соответствующим пунктом в меню Справка.</"
+"p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Невозможно создать папку: %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 ""
+"<p>При нажатии Escape активируется средство выделения.\n"
+"А при нажатии Backspace активируется средство, использовавшееся до этого.</"
+"p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Диаграмма пуста"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Чтобы выделить все объекты, нажмите Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "При сохранении диаграммы в %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 ""
+"<p>Вы можете создать новый класс с помощью мастера новых классов в меню Код."
+"</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "new_stereotype"
diff --git a/tde-i18n-rw/messages/tdesdk/umbrello.po b/tde-i18n-rw/messages/tdesdk/umbrello.po
index 12275856f7f..a84e63cf5ca 100644
--- a/tde-i18n-rw/messages/tdesdk/umbrello.po
+++ b/tde-i18n-rw/messages/tdesdk/umbrello.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2005-05-25 18:12-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,276 +24,232 @@ 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"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
+"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
+"NSENGIYUMVA"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Idosiye Kuri Gufungura "
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
+"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
+"ndonatienuk@yahoo.co.uk"
 
-#: docgenerators/main.cpp:64
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
 #, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "( C ) , ( C ) - "
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr ""
+msgid "Enter Activity Name"
+msgstr "injiza/andika umutwe"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
 #, fuzzy
-msgid "Exporting all views..."
-msgstr "Nka ... "
+msgid "Enter the name of the new activity:"
+msgstr "i Izina: Bya i Gishya Umurimo : "
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Kuringaniza Ibumoso"
 
-#: 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
-#, fuzzy, c-format
-msgid "There was a problem saving file: %1"
-msgstr "A Mu kubika Idosiye : %1 "
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Kuringaniza Iburyo"
 
-#: 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 "Bika ikosa"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Kuringaniza Ahabanza"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Igikoresho"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Kuringaniza Impera"
 
-#: worktoolbar.cpp:246
+#: aligntoolbar.cpp:44
 #, fuzzy
-msgid "Synchronous Message"
-msgstr "Ubutumwa Bubanza"
+msgid "Align Vertical Middle"
+msgstr "Gutondeka hagati impagarike"
 
-#: worktoolbar.cpp:247
+#: aligntoolbar.cpp:45
 #, fuzzy
-msgid "Asynchronous Message"
-msgstr "ikintu kitaboneka ako kanya"
+msgid "Align Horizontal Middle"
+msgstr "Kuringaniza Hagati mu Butambike"
 
-#: association.cpp:87 worktoolbar.cpp:248
+#: aligntoolbar.cpp:46
 #, fuzzy
-msgid "Association"
-msgstr "Ishyirahamwe"
+msgid "Align Vertical Distribute"
+msgstr "Gutondeka hagati impagarike"
 
-#: association.cpp:93 worktoolbar.cpp:249
+#: aligntoolbar.cpp:47
 #, fuzzy
-msgid "Containment"
-msgstr "Kotajante"
-
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Agafashi"
-
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Akarango"
+msgid "Align Horizontal Distribute"
+msgstr "Kuringaniza Hagati mu Butambike"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Igisobanuro"
+#: aligntoolbar.cpp:383
+#, fuzzy
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Itunganya Kuri Guhitamo Ku 2 Ibintu nka Inzego Cyangwa . OYA Itunganya . "
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Agasanduku"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Ihinduramiterere"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Umukinnyi"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
+#: association.cpp:84
 #, fuzzy
-msgid "Dependency"
-msgstr "Kwerekana Ibitigenga"
+msgid "Generalization"
+msgstr "Ibisobanuro rusange"
 
 #: association.cpp:85 worktoolbar.cpp:256
 #, fuzzy
 msgid "Aggregation"
 msgstr "Imimaro rusange"
 
-#: worktoolbar.cpp:257
-#, fuzzy
-msgid "Relationship"
-msgstr "Amasano"
-
-#: worktoolbar.cpp:258
+#: association.cpp:86 worktoolbar.cpp:255
 #, fuzzy
-msgid "Directional Association"
-msgstr "Icapa byerekezobibiri"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr ""
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "ibirindiro"
+msgid "Dependency"
+msgstr "Kwerekana Ibitigenga"
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+#: association.cpp:87 worktoolbar.cpp:248
 #, fuzzy
-msgid "Use Case"
-msgstr "Izinakoresha"
-
-#. 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 "ishuri,urwego"
+msgid "Association"
+msgstr "Ishyirahamwe"
 
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#: association.cpp:88
 #, fuzzy
-msgid "Initial State"
-msgstr "Umubare watangiye:"
+msgid "Self Association"
+msgstr "Ishyirahamwe"
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#: association.cpp:89
 #, fuzzy
-msgid "End State"
-msgstr "Impera "
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr ""
+msgid "Collaboration Message"
+msgstr "Guhimba Ubutumwa"
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+#: association.cpp:90
 #, fuzzy
-msgid "Fork/Join"
-msgstr "Mvamahanga"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Porogaramu"
+msgid "Sequence Message"
+msgstr "Kohereza Ubutumwa"
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#: association.cpp:91
 #, fuzzy
-msgid "Component"
-msgstr "Umurongo w'inyangingo"
+msgid "Collaboration Self Message"
+msgstr "Kureka ubutumwa"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#: association.cpp:92
 #, fuzzy
-msgid "Node"
-msgstr "Igisobanuro"
+msgid "Sequence Self Message"
+msgstr "Kureka ubutumwa"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#: association.cpp:93 worktoolbar.cpp:249
 #, fuzzy
-msgid "Artifact"
-msgstr "Umuhanzi"
+msgid "Containment"
+msgstr "Kotajante"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Imigaragarire"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "ibirindiro"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+#: association.cpp:95
 #, fuzzy
-msgid "Datatype"
-msgstr "Ubwoko bw'ibyatanzwe"
+msgid "Realization"
+msgstr "Isano"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#: association.cpp:96
 #, fuzzy
-msgid "Enum"
-msgstr "Imibare I"
+msgid "Uni Association"
+msgstr "Ishyirahamwe"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-#, fuzzy
-msgid "Entity"
-msgstr "Icyinjijwe"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Agafashi"
 
-#: worktoolbar.cpp:275
+#: association.cpp:98 worktoolbar.cpp:284
 #, fuzzy
-msgid "Deep History"
-msgstr "Gusiba Amateka"
+msgid "State Transition"
+msgstr "Inyuranamo ry'Igice"
 
-#: worktoolbar.cpp:276
-#, fuzzy
-msgid "Shallow History"
-msgstr "Kubika Amateka"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr "Umurimo"
 
-#: worktoolbar.cpp:277
+#: associationwidget.cpp:2328
 #, fuzzy
-msgid "Join"
-msgstr "ku"
+msgid "Multiplicity"
+msgstr "kuba"
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "Ifishi"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
 
-#: worktoolbar.cpp:279
+#: associationwidget.cpp:2346
 #, fuzzy
-msgid "Junction"
-msgstr "Umumaro"
+msgid "Association Name"
+msgstr "Ishyirahamwe"
 
-#: worktoolbar.cpp:280
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 #, fuzzy
-msgid "Choice"
-msgstr "Ijwi"
+msgid "Enter association name:"
+msgstr "Ishyirahamwe Izina: : "
 
-#: association.cpp:98 worktoolbar.cpp:284
+#: associationwidget.cpp:2366
 #, fuzzy
-msgid "State Transition"
-msgstr "Inyuranamo ry'Igice"
+msgid "Role Name"
+msgstr "Izina ry'idosiye"
 
-#: worktoolbar.cpp:285
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
 #, fuzzy
-msgid "Activity Transition"
-msgstr "InyuranamoRyikoresha"
-
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
-msgstr "Umurimo"
-
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Leta"
+msgid "Enter role name:"
+msgstr "Inshingano Izina: : "
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#: classifier.cpp:201
 #, fuzzy
-msgid "End Activity"
-msgstr "Impera "
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr "Igikorwa Na: i Izina: na Isinya . OYA &Ongera Nanone . "
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
 #, fuzzy
-msgid "Initial Activity"
-msgstr "Umurimo"
+msgid "That is an invalid name."
+msgstr "ni Bitemewe Izina: . "
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Ubutumwa"
+#: 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 "Izina si ryo"
 
-#: worktoolbar.cpp:298
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
 #, fuzzy
-msgid "UNDEFINED"
-msgstr "Bidasobanuye"
+msgid "That name is already being used."
+msgstr "Izina: ni Byakoreshejwe . "
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Guhitamo"
+#: 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
+#, fuzzy
+msgid "Not a Unique Name"
+msgstr "A "
 
 #: clipboard/umlclipboard.cpp:687
 #, fuzzy
 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."
+"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 ""
 "Rimwe Bya i Ibigize in i Ububikokoporora OYA Ikintu Bya i Izina: . Ikindi "
 "Ibigize . "
@@ -309,8 +265,8 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Gufungura Idosiye %1 ya:  . Ubwoko i Ububiko... na Uruhushya Kuri Kwandika Kuri "
-". "
+"Gufungura Idosiye %1 ya:  . Ubwoko i Ububiko... na Uruhushya Kuri Kwandika "
+"Kuri . "
 
 #: codegenerator.cpp:473
 #, fuzzy
@@ -319,10 +275,8 @@ msgstr "Gufungura Idosiye "
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
 #, fuzzy
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kurema i Ububiko... : \n"
+msgid "Cannot create the folder:\n"
+msgstr "Kurema i Ububiko... : \n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 #, fuzzy
@@ -338,1394 +292,1756 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Isubiranyuma: Kurema Ububiko"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Amahitamo Rusange"
+
+#: codegenerators/cppcodegenerationform.cpp:38
 #, fuzzy
-msgid "Enter State Name"
-msgstr "Kwinjiza izina:"
+msgid "Package is a namespace"
+msgstr "ni A "
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+#: codegenerators/cppcodegenerationform.cpp:41
 #, fuzzy
-msgid "Enter the name of the new state:"
-msgstr "i Izina: Bya i Gishya Leta : "
+msgid "Virtual destructors"
+msgstr "Name=Ibiro Bitagaragara"
 
-#: statewidget.cpp:176
+#: codegenerators/cppcodegenerationform.cpp:44
 #, fuzzy
-msgid "Enter Activity"
-msgstr "Umurimo"
+msgid "Generate empty constructors"
+msgstr "ubusa "
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr ""
+
+#: codegenerators/cppcodegenerationform.cpp:50
 #, fuzzy
-msgid "Enter the name of the new activity:"
-msgstr "i Izina: Bya i Gishya Umurimo : "
+msgid "Operations are inline"
+msgstr "Mumurongo "
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
+#: codegenerators/cppcodegenerationform.cpp:53
 #, fuzzy
-msgid "new activity"
-msgstr "Gishya Umurimo "
+msgid "Accessors are inline"
+msgstr "Mumurongo "
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: codegenerators/cppcodegenerationform.cpp:57
 #, fuzzy
-msgid "UML Model"
-msgstr "Urugero"
+msgid "Accessors are public"
+msgstr "public "
 
-#: umldoc.cpp:106
+#: codeimport/classimport.cpp:34
 #, fuzzy
-msgid "Logical View"
-msgstr "Bijyanye n'inyurabwenge"
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Idosiye : %1 "
 
-#: umldoc.cpp:107
+#: 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 "Cyiteguye."
+
+#: codeimport/import_utils.cpp:181
 #, fuzzy
-msgid "Use Case View"
-msgstr "Gufunga igaragaza Ngenga"
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "i Ingano: %1 A Cyangwa A Urwego: ? "
 
-#: umldoc.cpp:108
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr ""
+
+#: codeimport/import_utils.cpp:183
 #, fuzzy
-msgid "Component View"
-msgstr "Igaragaza ry'ibikubiyemo"
+msgid "Namespace"
+msgstr "Imyanyazina"
 
-#: umldoc.cpp:109
+#: 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 "ishuri,urwego"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Ikosa ry'imbere"
+
+#: codeimport/kdevcppparser/errors.cpp:24
 #, fuzzy
-msgid "Deployment View"
-msgstr "Igaragaza nyandiko"
+msgid "Syntax Error before '%1'"
+msgstr "Ikosa Mbere ' %1 ' "
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/kdevcppparser/errors.cpp:25
+#, fuzzy
+msgid "Parse Error before '%1'"
+msgstr "Ikosa Mbere ' %1 ' "
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
 #, fuzzy
-msgid "Datatypes"
-msgstr "Ubwoko bw'ibyatanzwe"
+msgid "expression expected"
+msgstr "imvugo Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:229
+#: codeimport/kdevcppparser/parser.cpp:598
 #, fuzzy
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr "Idosiyeirihoyahinduwe."
+msgid "Declaration syntax error"
+msgstr "Ikosa "
 
-#: umldoc.cpp:355
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
 #, fuzzy
-msgid "The file %1 does not exist."
-msgstr "Idosiye\"%1\"ntibaho."
+msgid "} expected"
+msgstr "}Itegerejwe:</%S>."
 
-#: 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
+#: codeimport/kdevcppparser/parser.cpp:684
 #, fuzzy
-msgid "Load Error"
-msgstr "Ikosa "
+msgid "namespace expected"
+msgstr "Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:380
+#: codeimport/kdevcppparser/parser.cpp:688
 #, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "Idosiye %1 Kuri . "
+msgid "{ expected"
+msgstr "{Itegerejwe:</%S>."
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, fuzzy, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Oya Idosiye Byabonetse in i Byegeranijwe Idosiye %1 . "
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+#, fuzzy
+msgid "Namespace name expected"
+msgstr "Izina: Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "A Ifungura i Idosiye : %1 "
+#: codeimport/kdevcppparser/parser.cpp:869
+#, fuzzy
+msgid "Need a type specifier to declare"
+msgstr "A Ubwoko: Kuri "
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, fuzzy, c-format
-msgid "There was a problem loading file: %1"
-msgstr "A Ifungura Idosiye : %1 "
+#: codeimport/kdevcppparser/parser.cpp:938
+#, fuzzy
+msgid "expected a declaration"
+msgstr "Ikitezwe: $(ARG1) A "
 
-#: umldoc.cpp:641
-#, fuzzy, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "A Koherezayo %1 Idosiye : %1 "
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+#, fuzzy
+msgid "Constant expression expected"
+msgstr "imvugo Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:934
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "')' ntigatunguranye"
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
 #, fuzzy
-msgid "use case diagram"
-msgstr "Koresha "
+msgid "} missing"
+msgstr "}kibura."
 
-#: umldoc.cpp:936
+#: codeimport/kdevcppparser/parser.cpp:2074
 #, fuzzy
-msgid "class diagram"
-msgstr "Urwego: "
+msgid "Member initializers expected"
+msgstr "Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:938
+#: codeimport/kdevcppparser/parser.cpp:2235
 #, fuzzy
-msgid "sequence diagram"
-msgstr "Igenzura ry'icyiciro"
+msgid "Base class specifier expected"
+msgstr "Base Urwego: Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:2260
+#, fuzzy
+msgid "Initializer clause expected"
+msgstr "Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:942
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Ikiranga ntigitunguranye"
+
+#: codeimport/kdevcppparser/parser.cpp:2337
 #, fuzzy
-msgid "state diagram"
-msgstr "Leta "
+msgid "Type id expected"
+msgstr "ID Ikitezwe: $(ARG1) "
 
-#: umldoc.cpp:944
+#: codeimport/kdevcppparser/parser.cpp:2374
 #, fuzzy
-msgid "activity diagram"
+msgid "Class name expected"
+msgstr "Izina: Ikitezwe: $(ARG1) "
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+#, fuzzy
+msgid "condition expected"
+msgstr "Ibisabwa Ikitezwe: $(ARG1) "
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+#, fuzzy
+msgid "statement expected"
+msgstr "Inyandiko Ikitezwe: $(ARG1) "
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+#, fuzzy
+msgid "for initialization expected"
+msgstr "ya:  Itangiza... Ikitezwe: $(ARG1) "
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+#, fuzzy
+msgid "catch expected"
+msgstr "Ikitezwe: $(ARG1) "
+
+#: 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 "Indangabintu"
+
+#: dialogs/activitydialog.cpp:70
+#, fuzzy
+msgid "Initial activity"
 msgstr "Umurimo "
 
-#: umldoc.cpp:946
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "component diagram"
-msgstr "Umurongo w'inyangingo"
+msgid "End activity"
+msgstr "Impera Umurimo "
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+#, fuzzy
+msgid "Fork/Join"
+msgstr "Mvamahanga"
 
-#: 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 "Izina"
+#: 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 "Rusange"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#: 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 "Ibirangakintu Rusange"
+
+#: dialogs/activitydialog.cpp:82
 #, fuzzy
-msgid "Enter name:"
+msgid "Activity type:"
+msgstr "Ubwoko: : "
+
+#: dialogs/activitydialog.cpp:87
+#, fuzzy
+msgid "Activity name:"
 msgstr "Izina: : "
 
-#: umldoc.cpp:984 umldoc.cpp:1017
+#: 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 "Inyandiko"
+
+#: 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 "That is an invalid name for a diagram."
-msgstr "ni Bitemewe Izina: ya:  A . "
+msgid "Font"
+msgstr "Imyandikire:"
 
-#: 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 "Izina si ryo"
+#: 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 "Amagenamiterere y'Imyandikire"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
+#: 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 "Ibara"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
 #, fuzzy
-msgid "A diagram is already using that name."
-msgstr "A ni ikoresha Izina: . "
+msgid "Widget Colors"
+msgstr "&Ibara rya Wijeti"
 
-#: 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
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
 #, fuzzy
-msgid "Not a Unique Name"
-msgstr "A "
+msgid "Activities"
+msgstr "Umurimo"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+#: dialogs/activitypage.cpp:72
 #, fuzzy
-msgid "That is an invalid name."
-msgstr "ni Bitemewe Izina: . "
+msgid "New Activity..."
+msgstr "Umurimo"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid "That name is already being used."
-msgstr "Izina: ni Byakoreshejwe . "
+msgid "Delete"
+msgstr "Gusiba ibara"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Guhindura izina"
+
+#: dialogs/activitypage.cpp:134
 #, fuzzy
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Izina: OYA Cyo nyine . \n"
-"iyi ? "
+msgid "New Activity"
+msgstr "Umurimo"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
 #, fuzzy
-msgid "Name Not Unique"
-msgstr "Izina ry'ikibazo"
+msgid "new activity"
+msgstr "Gishya Umurimo "
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "Use Name"
-msgstr "Izinakoresha"
+msgid "Rename Activity"
+msgstr "Umurimo"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Kwinjiza izina:"
+msgid "Enter the new name of the activity:"
+msgstr "i Gishya Izina: Bya i Umurimo : "
 
-#: umldoc.cpp:1099
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Izina:"
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Ubwoko:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
 #, fuzzy
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Kuri Gusiba %1 ? "
+msgid "Associations"
+msgstr "Ishyirahamwe"
 
-#: umldoc.cpp:1099
+#: dialogs/assocpropdlg.cpp:39
 #, fuzzy
-msgid "Delete Diagram"
-msgstr "Gusiba Ikadiri"
+msgid "Association Properties"
+msgstr "Indangabintu y'ihuriro"
 
-#: umldoc.cpp:1573
+#: 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 "Igenamiterere rusange"
+
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "Setting up the document..."
-msgstr "Hejuru i Inyandiko ... "
+msgid "Roles"
+msgstr "Inshingano"
 
-#: umldoc.cpp:1600
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "Resolving object references..."
-msgstr "Igikoresho Indango ... "
+msgid "Role Settings"
+msgstr "Amagenamiterere y'ububiko"
 
-#: umldoc.cpp:1638
+#: dialogs/assocpropdlg.cpp:112
 #, fuzzy
-msgid "Loading UML elements..."
-msgstr "Ibintu ... "
+msgid "Association font"
+msgstr "Imyandikire "
 
-#: umldoc.cpp:1811
+#: dialogs/assocrolepage.cpp:50
 #, fuzzy
-msgid "Loading diagrams..."
-msgstr "Mu gufungura imigereka..."
+msgid "Role A Properties"
+msgstr "A "
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#: dialogs/assocrolepage.cpp:51
 #, fuzzy
-msgid "kde-uml-Diagram"
-msgstr "kde - - "
+msgid "Role B Properties"
+msgstr "Ibiranga ububiko"
 
-#: umldoc.cpp:2104
-#, fuzzy, c-format
-msgid "/autosave%1"
-msgstr "/NyaMwishyingura %1 "
+#: dialogs/assocrolepage.cpp:68
+#, fuzzy
+msgid "Role A Visibility"
+msgstr "A "
 
-#: umllistview.cpp:348
+#: dialogs/assocrolepage.cpp:69
 #, fuzzy
-msgid "Externalize Folder"
-msgstr "Ububiko bwihariye"
+msgid "Role B Visibility"
+msgstr "igaragara"
 
-#: umllistview.cpp:416
+#: dialogs/assocrolepage.cpp:70
 #, fuzzy
-msgid "Enter Model Name"
-msgstr "Kwinjiza izina ry'ububiko rishya:"
+msgid "Role A Changeability"
+msgstr "A "
 
-#: umllistview.cpp:417
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr ""
+
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, fuzzy, no-c-format
+msgid "Rolename:"
+msgstr "Guhindura izina"
+
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, fuzzy, no-c-format
+msgid "Multiplicity:"
+msgstr "kuba"
+
+#: 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 "Rusange"
+
+#: 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 "By'umwihariko"
+
+#: 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 "Rwugawe"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Inyandiko"
+
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, fuzzy, no-c-format
+msgid "Changeable"
+msgstr "Guhindura Urwego"
+
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, fuzzy, no-c-format
+msgid "Frozen"
+msgstr "Imbere"
+
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, fuzzy, no-c-format
+msgid "Add only"
+msgstr "Kongeraho ibyatanzwe gusa"
+
+#: dialogs/classgenpage.cpp:50
 #, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "i Gishya Izina: Bya i Urugero : "
+msgid "Class &name:"
+msgstr "izina y'ubwoko"
 
-#: umllistview.cpp:1007
+#: dialogs/classgenpage.cpp:52
 #, fuzzy
-msgid "Views"
-msgstr "Igaragaza"
+msgid "Actor &name:"
+msgstr "Izina: : "
 
-#: umllistview.cpp:1906
+#: dialogs/classgenpage.cpp:54
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Izina: Bitemewe . \n"
-"Kureka . "
+msgid "Package &name:"
+msgstr "Izina: : "
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
+#: dialogs/classgenpage.cpp:56
 #, fuzzy
-msgid "Name Not Valid"
-msgstr "Izin&a kuri karita:"
+msgid "Use case &name:"
+msgstr "Izina: : "
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
+#: dialogs/classgenpage.cpp:58
 #, fuzzy
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Izina: OYA Cyo nyine ! \n"
-"Kureka . "
+msgid "Interface &name:"
+msgstr "Izina: : "
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+#: dialogs/classgenpage.cpp:60
 #, fuzzy
-msgid "Creation canceled"
-msgstr "Kureka "
+msgid "Component &name:"
+msgstr "Izina: : "
 
-#: umllistview.cpp:2338
+#: dialogs/classgenpage.cpp:62
 #, fuzzy
-msgid "Loading listview..."
-msgstr "Gufungura Ubutumwa..."
+msgid "Artifact &name:"
+msgstr "Izina: : "
 
-#: umllistview.cpp:2670
+#: dialogs/classgenpage.cpp:64
 #, fuzzy
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Ububiko... Mbere Kyasibwe: %S . "
+msgid "Enum &name:"
+msgstr "Izina: : "
 
-#: umllistview.cpp:2671
+#: dialogs/classgenpage.cpp:66
 #, fuzzy
-msgid "Folder Not Empty"
-msgstr "Ububiko ntibufite ubusa"
+msgid "Datatype &name:"
+msgstr "Izina: : "
 
-#: classifier.cpp:201
+#: dialogs/classgenpage.cpp:68
 #, fuzzy
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "Igikorwa Na: i Izina: na Isinya . OYA &Ongera Nanone . "
+msgid "Entity &name:"
+msgstr "Izina: : "
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
 #, fuzzy
-msgid "Enter Activity Name"
-msgstr "injiza/andika umutwe"
+msgid "&Stereotype name:"
+msgstr "Izina: : "
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
+#: dialogs/classgenpage.cpp:107
 #, fuzzy
-msgid "new state"
-msgstr "Gishya Leta "
+msgid "&Package name:"
+msgstr "Izina: : "
 
-#: association.cpp:84
+#: dialogs/classgenpage.cpp:121
 #, fuzzy
-msgid "Generalization"
-msgstr "Ibisobanuro rusange"
+msgid "A&bstract class"
+msgstr "Urwego: "
 
-#: association.cpp:88
+#: dialogs/classgenpage.cpp:123
 #, fuzzy
-msgid "Self Association"
-msgstr "Ishyirahamwe"
+msgid "A&bstract use case"
+msgstr "Koresha "
 
-#: association.cpp:89
+#: dialogs/classgenpage.cpp:131
 #, fuzzy
-msgid "Collaboration Message"
-msgstr "Guhimba Ubutumwa"
+msgid "&Executable"
+msgstr "Bitangizwa:"
 
-#: association.cpp:90
+#: dialogs/classgenpage.cpp:138
 #, fuzzy
-msgid "Sequence Message"
-msgstr "Kohereza Ubutumwa"
+msgid "Draw As"
+msgstr "Gushushanya"
 
-#: association.cpp:91
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Mburabuzi"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Kuzuza"
+
+#: dialogs/classgenpage.cpp:149
 #, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Kureka ubutumwa"
+msgid "&Library"
+msgstr "Isomero"
 
-#: association.cpp:92
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "Imbonerahamwe"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "igaragara"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
 #, fuzzy
-msgid "Sequence Self Message"
-msgstr "Kureka ubutumwa"
+msgid "P&ublic"
+msgstr "Rusange"
 
-#: association.cpp:95
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
 #, fuzzy
-msgid "Realization"
-msgstr "Isano"
+msgid "P&rivate"
+msgstr "By'umwihariko"
 
-#: association.cpp:96
+#: dialogs/classgenpage.cpp:182
 #, fuzzy
-msgid "Uni Association"
-msgstr "Ishyirahamwe"
+msgid "Pro&tected"
+msgstr "Birinzwe"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "Inyandiko"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "&Diagram"
-msgstr "Biberamye"
+#: dialogs/classgenpage.cpp:256
+#, fuzzy
+msgid "Class name:"
+msgstr "izina y'ubwoko"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "Inshya"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#, fuzzy
+msgid "Instance name:"
+msgstr "Izina ry'Urugero"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, fuzzy, no-c-format
-msgid "Sh&ow"
-msgstr "Garagaza"
+#: dialogs/classgenpage.cpp:272
+#, fuzzy
+msgid "Draw as actor"
+msgstr "Nka Umukinnyi "
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "&Code"
-msgstr "Inyandikoporogaramu"
+#: dialogs/classgenpage.cpp:277
+#, fuzzy
+msgid "Multiple instance"
+msgstr "Urugero "
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Active &Language"
-msgstr "&Ururimi"
+#: dialogs/classgenpage.cpp:284
+#, fuzzy
+msgid "Show destruction"
+msgstr "Kwerekana ibiro "
 
-#. 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 "Inyandiko"
+#: dialogs/classgenpage.cpp:322
+#, fuzzy
+msgid "Component name:"
+msgstr "Izina: : "
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, no-c-format
-msgid "Slash-Slash (//)"
-msgstr ""
+#: dialogs/classgenpage.cpp:324
+#, fuzzy
+msgid "Node name:"
+msgstr "Izina: : "
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, no-c-format
-msgid "Slash-Star (/**  */)"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+#, fuzzy
+msgid "Stereotype name:"
+msgstr "Izina: : "
+
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
+#, fuzzy
+msgid ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
+"Izina: Byakoreshejwe . \n"
+"Izina: Kugarura . "
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Imisusire"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+#, fuzzy
+msgid "Name is Not Unique"
+msgstr "ni "
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "< p Itunganya = \" Hagati \" > + + </p> "
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Ibiranga"
 
-#. 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 "Rusange"
+#: dialogs/classifierlistpage.cpp:39
+#, fuzzy
+msgid "N&ew Attribute..."
+msgstr "Guhindura Ibiranga..."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr ""
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Ibikorwa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "ya:  Inzego in Inyandikoporogaramu : "
+#: dialogs/classifierlistpage.cpp:42
+#, fuzzy
+msgid "N&ew Operation..."
+msgstr "Isano Rishya..."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "QPtrList"
-msgstr "Urutonde"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Inyandikorugero"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "vector"
-msgstr "Umukinnyi"
+#: dialogs/classifierlistpage.cpp:45
+#, fuzzy
+msgid "N&ew Template..."
+msgstr "Inyandikorugero nshya"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "<b>Variable</b>"
-msgstr "Impinduragaciro"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals"
+msgstr "Impishanyandiko y'inyuguti"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classifierlistpage.cpp:48
+#, fuzzy
+msgid "N&ew Enum Literal..."
+msgstr "Mucapyi nshya..."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "QString"
-msgstr "Ikurikiranyanyuguti"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "Guhindura Ikiranga"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "Ikurikiranyanyuguti"
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "Guhindura Ibiranga..."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Gusiba ibara"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "Indangabintu"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, fuzzy, no-c-format
-msgid "qptrlist.h"
-msgstr ". h "
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Garagaza"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, fuzzy, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i> &Rusange ? </i> "
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+#, fuzzy
+msgid "Operatio&ns"
+msgstr "Ibikorwa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, fuzzy, no-c-format
-msgid "qstring.h"
-msgstr ". h "
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+#, fuzzy
+msgid "&Visibility"
+msgstr "Ukugaragara"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Class name"
-msgstr "izina y'ubwoko"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+#, fuzzy
+msgid "O&peration signature"
+msgstr "Isinya "
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, fuzzy, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i> < p Itunganya = \" Hagati \" > Idosiye </p> </i> "
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+#, fuzzy
+msgid "Pac&kage"
+msgstr "Porogaramu"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Project Generation"
-msgstr "Ibisobanuro by'umushinga"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+#, fuzzy
+msgid "Att&ributes"
+msgstr "Ibiranga"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Inyandiko "
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+#, fuzzy
+msgid "Stereot&ype"
+msgstr "Ubwoko bw'ibyiciro"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, fuzzy, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "&Uburyo bw'Ihamya"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+#, fuzzy
+msgid "Attr&ibute signature"
+msgstr "Isinya "
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr ""
+#: dialogs/classoptionspage.cpp:108
+#, fuzzy
+msgid "Draw as circle"
+msgstr "Nka Uruziga "
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Kugaragaza"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118
+#, fuzzy
+msgid "Display Options"
+msgstr "Kwerekana amahitamo"
 
-#. 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 "Rusange"
+#: dialogs/classpropdlg.cpp:179
+#, fuzzy
+msgid "Attribute Settings"
+msgstr "Imikorereshereje Ya Mucapyi"
 
-#. 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 "By'umwihariko"
+#: dialogs/classpropdlg.cpp:187
+#, fuzzy
+msgid "Operation Settings"
+msgstr "Amagenamiterere mburabuzi"
 
-#. 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 "Rwugawe"
+#: dialogs/classpropdlg.cpp:195
+#, fuzzy
+msgid "Templates Settings"
+msgstr "Amagenamiterere y'Umwandiko"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, fuzzy, no-c-format
-msgid "From Parent Object"
-msgstr "Igikoresho cy'Ifishi"
+#: dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals Settings"
+msgstr "Igenamiterere rusange"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Ikiranga: Ingano: : "
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "Guhindura ibyashizweho bishiraho ikizere:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "Ishyirahamwe Umwanya Ingano: : "
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Kotajante"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, fuzzy, no-c-format
-msgid "From Parent Role"
-msgstr "Ububiko Mubyeyi"
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents Settings"
+msgstr "Amagenamiterere y'Imyandikire"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
+#: dialogs/classpropdlg.cpp:222
+#, fuzzy
+msgid "Class Associations"
+msgstr "aho ishuri riri"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, fuzzy, no-c-format
-msgid "Hash (#)"
-msgstr "Akanyerezo (Bitsindagiye)"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#, fuzzy
+msgid "new_class"
+msgstr "Icyiciro cy'igerageza"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, fuzzy, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "- Impera ( = = Impera ) "
+#: dialogs/classwizard.cpp:54
+#, fuzzy
+msgid "New Class"
+msgstr "Icyiciro cy'Igerageza"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
+#: dialogs/classwizard.cpp:59
+#, fuzzy
+msgid "Class Attributes"
+msgstr "Ibiranga akadirishya"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classwizard.cpp:63
+#, fuzzy
+msgid "Class Operations"
+msgstr "Ibikorwa"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, fuzzy, no-c-format
 msgid "Code Generation Options"
 msgstr "Idosiye y'amahitamo y'ikora ry'urusobe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Ururimi"
+#: dialogs/codegenerationwizard.cpp:70
+#, fuzzy
+msgid "&Generate"
+msgstr "Rusange"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Ububiko"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Kurangiza"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, fuzzy, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Byose Idosiye Kuri Ububiko... : "
+#: dialogs/codegenerationwizard.cpp:132
+#, fuzzy
+msgid "Code Generated"
+msgstr "Hejuru hagati"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, fuzzy, no-c-format
-msgid "Bro&wse..."
-msgstr "Gushakisha..."
+#: dialogs/codegenerationwizard.cpp:134
+#, fuzzy
+msgid "Not Generated"
+msgstr "Bitari hagati"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, fuzzy, no-c-format
-msgid "B&rowse..."
-msgstr "Gushakisha..."
+#: dialogs/codegenerationwizard.cpp:141
+#, fuzzy
+msgid "Not Yet Generated"
+msgstr "Bitari hagati"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, fuzzy, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "Umutwempangano Idosiye Kuva: Ububiko... : "
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Ububiko... %1 OYA . Kuri Kurema NONEAHA ? "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, fuzzy, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "ku Kuri iyi Ububiko... "
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Idosiye cyangwa Ububiko Ntibibaho"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, fuzzy, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Kurema Ububiko"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "Ntacyo Bimbwiye"
+
+#: dialogs/codegenerationwizard.cpp:168
+#, fuzzy
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"in iyi Ububiko... Byakoreshejwe Nka Umutwempangano Idosiye in i "
-"Inyandikoporogaramu "
+"Ububiko... OYA Byaremwe . \n"
+"Ubwoko Kwandika Kuri Ububiko... Cyangwa Guhitamo , Byemewe , Ububiko... . "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, fuzzy, no-c-format
-msgid "Overwrite Policy"
-msgstr "Gusimbuza "
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Ikosa "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, fuzzy, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "Guhitamo A Byemewe Ububiko... . "
+
+#: dialogs/codegenerationwizard.cpp:184
+#, fuzzy
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"A Idosiye Na: i Izina: Nka i Izina: Inyandikoporogaramu \n"
-"Kuri Koresha Nka Ibisohoka Idosiye : "
+"Ibisohoka Ububiko... , ni OYA . \n"
+"Gushyiraho i Uruhushya Cyangwa Hitamo... Ububiko... . "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, fuzzy, no-c-format
-msgid "O&verwrite"
-msgstr "Guhindura"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "Ikosa Kuri "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, fuzzy, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Gusimbuza Idosiye NIBA in i Ishyika: Ububiko... "
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 OYA Kuri A Ububiko... . Hitamo... A Byemewe Ububiko... . "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, fuzzy, no-c-format
-msgid "As&k"
-msgstr "Kubaza"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "Usabwe guhitamo akamenyetso."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, fuzzy, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "A Idosiye Na: i Izina: , ask Kuri "
+msgid "Code Viewer"
+msgstr "Gufunga Igaragaza"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, fuzzy, no-c-format
-msgid "&Use a different name"
-msgstr "A Izina: "
+#: dialogs/defaultcodegenpolicypage.cpp:36
+#, fuzzy
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "< p Itunganya = \" Hagati \" > . </p> "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, fuzzy, 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 ""
-"A Idosiye in i Ishyika: Ububiko... , Guhitamo A Izina: Kuri Koresha ku Wongera "
-"A Ingereka Kuri i Idosiye Izina: "
+#: dialogs/diagramprintpage.cpp:35
+#, fuzzy
+msgid "&Diagrams"
+msgstr "Ibiganiro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Ihinduramiterere"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Muyunguruzi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Imirongo"
+#: dialogs/diagramprintpage.cpp:48
+#, fuzzy
+msgid "&Current diagram"
+msgstr "Iki Gihe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
-msgstr "Imisusire : "
+#: dialogs/diagramprintpage.cpp:53
+#, fuzzy
+msgid "&All diagrams"
+msgstr "Paji zose"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, fuzzy, no-c-format
-msgid "Indentation type:"
-msgstr "Ubwoko: : "
+#: dialogs/diagramprintpage.cpp:57
+#, fuzzy
+msgid "&Select diagrams"
+msgstr "Guhitamo ububikoshingiro"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, fuzzy, no-c-format
-msgid "Indentation amount:"
-msgstr "Igiteranyo  : "
+#: dialogs/diagramprintpage.cpp:61
+#, fuzzy
+msgid "&Type of diagram"
+msgstr "Bya "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"* ( \" \n"
-"n \" ) "
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Ihitamo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"( \" \\r \n"
-"n \" ) "
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+#, fuzzy
+msgid "Use Case"
+msgstr "Izinakoresha"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, fuzzy, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "MAC"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+#, fuzzy
+msgid "Collaboration"
+msgstr "Ishyiramo rumuri"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, fuzzy, no-c-format
-msgid "No Indentation"
-msgstr "Isunika"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+#, fuzzy
+msgid "Sequence"
+msgstr "Ubwisubire"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Isimbuka"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Leta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Umwanya"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#, fuzzy
+msgid "Component"
+msgstr "Umurongo w'inyangingo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, fuzzy, no-c-format
-msgid "Comment Verbosity"
-msgstr "Ibisobanuro"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "ikigize"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, fuzzy, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "kde - - "
+
+#: dialogs/diagramprintpage.cpp:135
+#, fuzzy
+msgid "No diagrams selected."
+msgstr "Byahiswemo . "
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
-"Ibisobanuro ya:  Ibyatoranyijwe ATARIIGIHARWE NIBA Icyiciro \n"
-"ni ubusa "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, fuzzy, no-c-format
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "icyitonderwa "
+
+#: dialogs/overwritedialogue.cpp:27
+#, fuzzy
+msgid "Destination File Already Exists"
+msgstr "Idosiye "
+
+#: dialogs/overwritedialogue.cpp:31
+#, fuzzy
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"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 ""
-"Ibisobanuro Kuri i Ibyatoranyijwe ( public , By'umwihariko ) in A Urwego: , "
-"ATARIIGIHARWE NIBA i Ibyatoranyijwe ubusa "
+"Idosiye %1 in %2 . \n"
+"\n"
+"Guhindura i Idosiye , A Izina: Cyangwa OYA iyi Idosiye . "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Inyandiko Ibisobanuro ATARIIGIHARWE NIBA ubusa "
+#: dialogs/overwritedialogue.cpp:34
+#, fuzzy
+msgid "&Apply to all remaining files"
+msgstr "Kuri Byose Idosiye "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Ibisobanuro ya:  Urwego: na Uburyo Inyandiko ATARIIGIHARWE NIBA ubusa "
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Gusimbuza"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Language Options"
-msgstr "Igice Ururimi"
+#: dialogs/overwritedialogue.cpp:39
+#, fuzzy
+msgid "&Generate Similar File Name"
+msgstr "Idosiye "
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Nyobora y'iyerekana"
+#: dialogs/overwritedialogue.cpp:40
+#, fuzzy
+msgid "&Do Not Generate File"
+msgstr "Idosiye "
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Select Classes"
-msgstr "Guhitamo idosiye"
+#: dialogs/parmpropdlg.cpp:35
+#, fuzzy
+msgid "Parameter Properties"
+msgstr "Indangakintu y'imashini-NshyiraRupapuro"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, fuzzy, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
-msgstr "Byose i Inzego Kuri in i Iburyo: Urutonde "
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Ubwoko:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, fuzzy, no-c-format
-msgid "Add class for code generation"
-msgstr "Urwego: ya:  Inyandikoporogaramu "
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "Izina:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, fuzzy, no-c-format
-msgid "Classes Selected"
-msgstr "&Kubika Ibyatoranyijwe"
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+#, fuzzy
+msgid "&Initial value:"
+msgstr "Umubare watangiye:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, fuzzy, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Urwego: Kuva: "
+#: dialogs/parmpropdlg.cpp:82
+#, fuzzy
+msgid "Passing Direction"
+msgstr "Icyerekerezo cyo gucapa"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, fuzzy, no-c-format
-msgid "Classes Available"
-msgstr "I(bi)huzagihe (b)ihari"
+#: dialogs/parmpropdlg.cpp:84
+#, fuzzy
+msgid ""
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
+msgstr ""
+"\" in \" ni A Ikintu , \" Inyuma \" ni A Ikintu na \" \" ni A Ikintu ya:  "
+"na . "
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, fuzzy, no-c-format
-msgid "Code Generation Status"
-msgstr "Imimerere y'ukwihuza"
+#: dialogs/pkgcontentspage.cpp:29
+#, fuzzy
+msgid "Contained Items"
+msgstr "Kirimo"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "i Akabuto Kuri Tangira &vendorShortName; i Inyandikoporogaramu "
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+#, fuzzy
+msgid "Select Operation"
+msgstr "Kugena Ibikorwa"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Generation Status"
-msgstr "Imimerere y'ukwihuza"
+#: dialogs/selectopdlg.cpp:43
+#, fuzzy
+msgid "Sequence number:"
+msgstr "Umubare : "
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "Gufunga Igaragaza"
+#: dialogs/selectopdlg.cpp:46
+#, fuzzy
+msgid "Class operation:"
+msgstr "Igikorwa : "
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, fuzzy, no-c-format
-msgid "Show hidden blocks"
-msgstr "Birahishe "
+#: dialogs/selectopdlg.cpp:54
+#, fuzzy
+msgid "Custom operation:"
+msgstr "Kunozaidosiyeya Igikorwa : "
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "< p Itunganya = \" Hagati \" > Izina: </p> "
+#: dialogs/settingsdlg.cpp:30
+#, fuzzy
+msgid "Umbrello Setup"
+msgstr "Iboneza rya Porogisi"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, fuzzy, no-c-format
-msgid "Show block type"
-msgstr "Funga Ubwoko: "
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Ahagenewe Ukoresha"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Amabara"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface Settings"
+msgstr "Amagenamiterere y'Imigaragarire"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Imyandikire:"
+#: dialogs/settingsdlg.cpp:54
+#, fuzzy
+msgid "Line color:"
+msgstr "Ibara ry'umurongo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, fuzzy, no-c-format
-msgid "Paper:"
-msgstr "urupapuro"
+#: dialogs/settingsdlg.cpp:60
+#, fuzzy
+msgid "D&efault Color"
+msgstr "Amabara mburabuzi"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, fuzzy, no-c-format
-msgid "Selected:"
-msgstr "Byatoranyijwe:"
+#: dialogs/settingsdlg.cpp:63
+#, fuzzy
+msgid "Fill color:"
+msgstr "Ibara ryo kuzuza"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Igikoresho Funga : </p> "
+#: dialogs/settingsdlg.cpp:69
+#, fuzzy
+msgid "De&fault Color"
+msgstr "Amabara mburabuzi"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Funga : </p> "
+#: dialogs/settingsdlg.cpp:73
+#, fuzzy
+msgid "Line width:"
+msgstr "Ubugari bw'Umurongo"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
+#: dialogs/settingsdlg.cpp:81
+#, fuzzy
+msgid "D&efault Width"
+msgstr "Itariki mburabuzi"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
+#: dialogs/settingsdlg.cpp:86
+#, fuzzy
+msgid "&Use fill color"
+msgstr "Kuzuza Ibara: "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, fuzzy, no-c-format
-msgid "Diagram Properties"
-msgstr "Ibiranga Ikadiri"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Izina:"
+#: dialogs/settingsdlg.cpp:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "Isubiranyuma "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Zoom:"
-msgstr "Ihindurangano..."
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:116
+#, fuzzy
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Gishya + + //"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, fuzzy, no-c-format
-msgid "Show operation signature"
-msgstr "Igikorwa Isinya "
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Ishyirahamwe Umwanya Ingano: : "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, fuzzy, no-c-format
-msgid "Show &grid"
-msgstr "Urusobetudirishya "
+#: dialogs/settingsdlg.cpp:126
+#, fuzzy
+msgid "Autosave"
+msgstr "NyaMwishyingura"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, fuzzy, no-c-format
-msgid "Snap &to grid"
-msgstr "Gukata ku Rusobe- tudirishya"
+#: dialogs/settingsdlg.cpp:132
+#, fuzzy
+msgid "E&nable autosave"
+msgstr "NyaMwishyingura "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "Ingano: "
+#: dialogs/settingsdlg.cpp:136
+#, fuzzy
+msgid "Select auto-save time interval (mins):"
+msgstr "Ikiyega - Kubika Igihe Intera ( ) : "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, fuzzy, no-c-format
+#: dialogs/settingsdlg.cpp:146
+#, fuzzy
+msgid "Set autosave suffix:"
+msgstr "NyaMwishyingura Ingereka : "
+
+#: dialogs/settingsdlg.cpp:148
 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."
+"<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 ""
-"i Ingano: Bya i Kuri A Igikubo Bya i Urusobetudirishya Itandukanya: . \n"
-"' Kuri ni Bikora A Buri gihe Na: i Urusobetudirishya ku Byose 4 . "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, fuzzy, no-c-format
-msgid "Grid spacing:  "
-msgstr "Itandukanya: : "
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Gutangira "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:164
+#, fuzzy
+msgid "Sta&rtup logo"
+msgstr "ikirango "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/settingsdlg.cpp:168
+#, fuzzy
+msgid "&Tip of the day"
+msgstr "Ingingo y'umunsi"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, fuzzy, no-c-format
-msgid "Line width:  "
-msgstr "Ubugari bw'Umurongo"
+#: dialogs/settingsdlg.cpp:172
+#, fuzzy
+msgid "&Load last project"
+msgstr "Iheruka Umushinga "
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Nka ... "
+#: dialogs/settingsdlg.cpp:176
+#, fuzzy
+msgid "Start new project with:"
+msgstr "Gutangira Gishya Umushinga Na: : "
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "No Diagram"
+msgstr "Nta gusimbuka amapaje"
 
-#. 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/settingsdlg.cpp:183
+#, fuzzy
+msgid "Class Diagram"
+msgstr "Ikiranga urwego"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Ubwoko: : "
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Sequence Diagram"
+msgstr "Igenzura ry'icyiciro"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "Collaboration Diagram"
+msgstr "Ibyatanzwe by'Iboneza"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "Ububiko"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "State Diagram"
+msgstr "Gukora Ikinyampande"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Activity Diagram"
+msgstr "Ikyerekana igikorwa"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
-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)."
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Component Diagram"
+msgstr "Umurongo w'inyangingo"
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, fuzzy, no-c-format
-msgid "Role Properties"
-msgstr "Ibiranga ububiko"
+#: dialogs/settingsdlg.cpp:210
+#, fuzzy
+msgid "Class Settings"
+msgstr "Amagenamiterere y'Amabara"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, fuzzy, no-c-format
-msgid "Rolename:"
-msgstr "Guhindura izina"
+#: dialogs/settingsdlg.cpp:217
+#, fuzzy
+msgid "Show &visibility"
+msgstr "Ukugaragara "
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, fuzzy, no-c-format
-msgid "Multiplicity:"
-msgstr "kuba"
+#: dialogs/settingsdlg.cpp:221
+#, fuzzy
+msgid "Show attributes"
+msgstr "Ibiranga "
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, fuzzy, no-c-format
-msgid "Role Changeability"
-msgstr "Guhindura Ubwijime"
+#: dialogs/settingsdlg.cpp:225
+#, fuzzy
+msgid "Show operations"
+msgstr "Ibikorwa: "
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, fuzzy, no-c-format
-msgid "Add only"
-msgstr "Kongeraho ibyatanzwe gusa"
+#: dialogs/settingsdlg.cpp:229
+#, fuzzy
+msgid "Show stereot&ype"
+msgstr "Kwerekana Isesenguranteruro"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, fuzzy, no-c-format
-msgid "Frozen"
-msgstr "Imbere"
+#: dialogs/settingsdlg.cpp:233
+#, fuzzy
+msgid "Show attribute signature"
+msgstr "Ikiranga: Isinya "
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, fuzzy, no-c-format
-msgid "Changeable"
-msgstr "Guhindura Urwego"
+#: dialogs/settingsdlg.cpp:238
+#, fuzzy
+msgid "Show package"
+msgstr "Porogaramu "
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
-msgid "Role Visibility"
-msgstr "igaragara"
+msgid "Show operation signature"
+msgstr "Igikorwa Isinya "
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, fuzzy, no-c-format
-msgid "Implementation"
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr "Gutangiza serivise"
+
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "Ikiranga: Ingano: : "
+
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "Igikorwa Ingano: : "
+
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation"
+msgstr "Comment=Irema ry'Umubarendanga "
+
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation Settings"
+msgstr "Igenamiterere ry'ihuza"
+
+#: dialogs/settingsdlg.cpp:301
+#, fuzzy
+msgid "Code Viewer Settings"
+msgstr "Amagenamiterere y'Igaragaza ry'Urutonde"
+
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "Initial state"
+msgstr "Leta "
+
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "End state"
+msgstr "Impera Leta "
+
+#: dialogs/statedialog.cpp:96
+#, fuzzy
+msgid "State type:"
+msgstr "Ubwoko: : "
+
+#: dialogs/statedialog.cpp:101
+#, fuzzy
+msgid "State name:"
+msgstr "Izina: : "
+
+#: dialogs/statedialog.cpp:130
+#, fuzzy
+msgid "Widget Color"
+msgstr "Ibara rya Wijeti"
+
+#: dialogs/umlattributedialog.cpp:42
+#, fuzzy
+msgid "Attribute Properties"
+msgstr "Indangakintu y'imashini-NshyiraRupapuro"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+#, fuzzy
+msgid "Classifier &scope (\"static\")"
+msgstr "Ingano: ( \" \" ) "
+
+#: dialogs/umlattributedialog.cpp:91
+#, fuzzy
+msgid "&Public"
+msgstr "Rusange"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+#, fuzzy
+msgid "Prot&ected"
+msgstr "Birinzwe"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
 msgstr "Inyandiko"
 
-#: tips.txt:3
+#: dialogs/umlattributedialog.cpp:155
 #, fuzzy
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p> Kuri . </p> \n"
-"<p> Ihangagishusho na Inyandiko Igikoresho . <a href=\"help:/umbrello\"> </a> "
-"ni A Intangiriro Kuri ikoresha . </p> \n"
+msgid "You have entered an invalid attribute name."
+msgstr "Bitemewe Ikiranga: Izina: . "
 
-#: tips.txt:9
+#: dialogs/umlattributedialog.cpp:156
 #, fuzzy
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr "<p>5."
+msgid "Attribute Name Invalid"
+msgstr "izina y'ikiranga"
 
-#: tips.txt:14
+#: dialogs/umlattributedialog.cpp:163
 #, fuzzy
 msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p> na . Hanyuma Kudatoranya &quot; ; in i . </p> \n"
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
 
-#: tips.txt:19
+#: dialogs/umlattributedialog.cpp:164
 #, fuzzy
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p> Ibigize OYA , Ihindurangero %O Kuri Kuri Ibigize . \n"
-", Ibisobanuro na Ubutumwa , Kanda na Kurura ku i Umutuku kare . </p> \n"
+msgid "Attribute Name Not Unique"
+msgstr "izina y'ikiranga"
 
-#: tips.txt:25
+#: dialogs/umlentityattributedialog.cpp:43
 #, fuzzy
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p> Kuri &Ongera Urwego: Kuri A Kurura Icyinjijwe Kuva: i &Igiti Reba . </p> \n"
+msgid "Entity Attribute Properties"
+msgstr "Indangabintu y'Umwanya w'Umwandiko "
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:73
 #, fuzzy
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p> Umukozi Himura Ibikorwa: hagati A Urwego: na na SHINGIRO \n"
-"Inzego . \n"
-"Kanda A Urwego: Kuri Gufungura i Umukozi . </p> \n"
+msgid "&Default value:"
+msgstr "Agaciro mburabuzi"
 
-#: tips.txt:37
+#: dialogs/umlentityattributedialog.cpp:81
 #, fuzzy
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p> Ibintu A Agasanduku na Nka . Kanda Rimwe . </p> \n"
+msgid "Length/Values:"
+msgstr "Uburebure:"
 
-#: tips.txt:43
+#: dialogs/umlentityattributedialog.cpp:84
 #, fuzzy
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p> Ubutumwa Nka . ku i Igikoresho Agasanduku ( i Uhagaritse: Umurongo: ) Kuri "
-"Ubwoko A . "
+msgid "&Auto increment"
+msgstr "Iyongeragaciro "
 
-#: tips.txt:48
+#: dialogs/umlentityattributedialog.cpp:88
 #, fuzzy
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p> Gushigikira Ubutumwa Kuri . ku i Uhagaritse: Umurongo: Nanone Kuri Kurema . "
-"</p> \n"
+msgid "Allow &null"
+msgstr "NTAGIHARI "
 
-#: tips.txt:53
+#: dialogs/umlentityattributedialog.cpp:92
 #, fuzzy
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p> ku Ifungura A Mvamahanga Idosiye Nta na kimwe ni in i Urutonde Reba , "
-"Kugerageza Mu kubika i Urugero A Izina: , \n"
-", na i Idosiye . i Urutonde Reba ni Hanyuma . \n"
-"</p> \n"
+msgid "Attributes:"
+msgstr "Ibiranga..."
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "gushyiraho umugereka"
+
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "Ntana kimwe"
 
-#: tips.txt:60
+#: dialogs/umlentityattributedialog.cpp:115
 #, fuzzy
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p> na Kwohereza hanze... i Ishusho Kuri A Ububikokoporora Ikindi Porogaramu . "
-"</p> \n"
+msgid "&Primary"
+msgstr "Agenga"
 
-#: tips.txt:66
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Umubarendanga"
+
+#: dialogs/umlentityattributedialog.cpp:121
+#, fuzzy
+msgid "&Unique"
+msgstr "Cyo nyine"
+
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+msgstr "Bitemewe Ikiranga: Izina: . "
+
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "Guhindura Ikiranga"
+
+#: dialogs/umlentityattributedialog.cpp:192
 #, fuzzy
 msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
+
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
 msgstr ""
-"<p> OYA Kuri in Imirongo , MAHARAKUBIRI ku Rimwe Kurema A Akadomo . </p> \n"
 
-#: tips.txt:71
+#: dialogs/umloperationdialog.cpp:50
 #, fuzzy
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgid "Operation Properties"
+msgstr "Indangabintu y'ibuto"
+
+#: dialogs/umloperationdialog.cpp:89
+#, fuzzy
+msgid "&Abstract operation"
+msgstr "Igikorwa "
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
-"<p> ku in i Ikiganiro . </p> \n"
 
-#: tips.txt:76
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Ibigenga"
+
+#: dialogs/umloperationdialog.cpp:141
 #, fuzzy
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr "<p>php."
+msgid "Ne&w Parameter..."
+msgstr "Mucapyi nshya..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+#, fuzzy
+msgid "You have entered an invalid parameter name."
+msgstr "Bitemewe Ikintu Izina: . "
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+#, fuzzy
+msgid "Parameter Name Invalid"
+msgstr "Ibigenga Iyingiza"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 #, fuzzy
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+msgstr "Ikintu Izina: Byakoreshejwe in iyi Igikorwa . "
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
 msgstr ""
-"<p> Gusiba Byose Byahiswemo Ibintu ku Cyangwa . </p> \n"
 
-#: tips.txt:91
+#: dialogs/umloperationdialog.cpp:406
 #, fuzzy
 msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p> Byabonetse A in , RW . \n"
-"Tanga Na: i in i Ibikubiyemo . </p> \n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:456
+#, fuzzy
+msgid "You have entered an invalid operation name."
+msgstr "Bitemewe Igikorwa Izina: . "
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+#, fuzzy
+msgid "Operation Name Invalid"
+msgstr "Igikorwa nticyashobotse."
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#, fuzzy
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Igikorwa Na: Isinya in %1 . \n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+#, fuzzy
+msgid "Choose a different name or parameter list."
+msgstr "A Izina: Cyangwa Ikintu Urutonde . "
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, fuzzy, no-c-format
+msgid "Role Properties"
+msgstr "Ibiranga ububiko"
+
+#: dialogs/umltemplatedialog.cpp:36
+#, fuzzy
+msgid "Template Properties"
+msgstr "Indangabintu y'ishusho"
+
+#: dialogs/umltemplatedialog.cpp:128
+#, fuzzy
+msgid "You have entered an invalid template name."
+msgstr "Bitemewe Nyandiko-rugero Izina: . "
+
+#: dialogs/umltemplatedialog.cpp:129
+#, fuzzy
+msgid "Template Name Invalid"
+msgstr "Izina ry'Inyandikorugero:"
+
+#: dialogs/umltemplatedialog.cpp:138
 #, fuzzy
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Nyandiko-rugero Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
+
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "Izina ry'Inyandikorugero:"
+
+#: dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Classes Display Options"
+msgstr "Kwerekana amahitamo"
+
+#: dialogs/umlviewdialog.cpp:100
+#, fuzzy
+msgid "Diagram Colors"
+msgstr "Dim Color"
+
+#: dialogs/umlviewdialog.cpp:164
+#, fuzzy
+msgid "The name you have entered is invalid."
+msgstr "Izina: ni Bitemewe . "
+
+#: dialogs/umlviewdialog.cpp:170
+#, fuzzy
+msgid "The name you have entered is not unique."
+msgstr "Izina: ni OYA Cyo nyine . "
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+#, fuzzy
+msgid "Name Not Unique"
+msgstr "Izina ry'ikibazo"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+#, fuzzy
+msgid "&Line:"
+msgstr "Umurongo:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+#, fuzzy
+msgid "&Fill:"
+msgstr "Kuzuza"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+#, fuzzy
+msgid "D&efault"
+msgstr "Mburabuzi"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+#, fuzzy
+msgid "&Use fill"
+msgstr "Kuzuza "
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Nka ... "
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p> i Urufunguzo i KIGEZWEHO Kuri i Guhitamo . \n"
-"Kuri i Byakoreshejwe . </p> \n"
 
-#: tips.txt:103
+#: 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
+#, fuzzy, c-format
+msgid "There was a problem saving file: %1"
+msgstr "A Mu kubika Idosiye : %1 "
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Bika ikosa"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
+
+#: docgenerators/main.cpp:47
 #, fuzzy
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgid "File to transform"
+msgstr "Idosiye Kuri Gufungura "
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p> Guhitamo Byose Ibintu ku - A . </p> \n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
 #, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "( C ) , ( C ) - "
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
 msgstr ""
-"<p> Kurema na Imikorere A Gishya Urwego: ikoresha i in i Ibikubiyemo . </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 "Izina"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#, fuzzy
+msgid "Enter name:"
+msgstr "Izina: : "
+
+#: floatingtextwidget.cpp:112
+#, fuzzy
+msgid "Enter operation name:"
+msgstr "Igikorwa Izina: : "
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+#, fuzzy
+msgid "Enter new text:"
+msgstr "Gishya Umwandiko : "
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "IKOSA"
+
+#: floatingtextwidget.cpp:264
+#, fuzzy
+msgid "Change Text"
+msgstr "Guhindura itagi"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "%1 OYA . "
+
+#: 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
+#, fuzzy
+msgid "Load Error"
+msgstr "Ikosa "
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Idosiye ntishobora gufungurwa"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 #, fuzzy
@@ -1789,6 +2105,10 @@ msgstr "Isano Rishya..."
 msgid "Select Operation..."
 msgstr "Kugena Ibikorwa"
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 #, fuzzy
 msgid "Change Text..."
@@ -1848,6 +2168,19 @@ msgstr "Gishya"
 msgid "Rename..."
 msgstr "Guhindura Izina..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Ikosa "
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 #, fuzzy
 msgid "Line Color..."
@@ -1882,15 +2215,29 @@ msgstr "Ububiko Butari bwo"
 msgid "Import Classes..."
 msgstr "Kuzana Inyandirugero..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Porogaramu"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#, fuzzy
+msgid "Artifact"
+msgstr "Umuhanzi"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
 msgid "Component Diagram..."
 msgstr "Umurongo w'inyangingo"
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#, fuzzy
+msgid "Node"
+msgstr "Igisobanuro"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 #, fuzzy
 msgid "Deployment Diagram..."
@@ -1900,11 +2247,20 @@ msgstr "Muyobora Nyandiko..."
 msgid "Folder"
 msgstr "Ububiko"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Icyinjijwe"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Amasano..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Umukinnyi"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr ""
@@ -1949,6 +2305,20 @@ msgstr "Guhindura Ibijyanye..."
 msgid "Export as Picture..."
 msgstr "Nka ... "
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Imigaragarire"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+#, fuzzy
+msgid "Datatype"
+msgstr "Ubwoko bw'ibyatanzwe"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#, fuzzy
+msgid "Enum"
+msgstr "Imibare I"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
 msgid "Class Diagram..."
@@ -1974,27 +2344,11 @@ msgstr "Igenzura ry'icyiciro"
 msgid "Collaboration Diagram..."
 msgstr "Ikadiri Ireremba..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Ibiranga"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Ibikorwa"
-
 #: listpopupmenu.cpp:676
 #, fuzzy
 msgid "Public Only"
 msgstr "Ifunguzo ngenga"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "igaragara"
-
 #: listpopupmenu.cpp:680
 #, fuzzy
 msgid "Operation Signature"
@@ -2010,11 +2364,6 @@ msgstr "izina y'ikiranga"
 msgid "Stereotype"
 msgstr "Ubwoko bw'ibyiciro"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Garagaza"
-
 #: listpopupmenu.cpp:707
 #, fuzzy
 msgid "Attribute..."
@@ -2045,14 +2394,6 @@ msgstr "Ibara ryo kuzuza"
 msgid "Use Fill Color"
 msgstr "Kuzuzamo Ibara"
 
-#: 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 "Ibara"
-
 #: listpopupmenu.cpp:1007
 #, fuzzy
 msgid "Actor..."
@@ -2088,11 +2429,31 @@ msgstr "Guhindura Izina..."
 msgid "Package..."
 msgstr "Porogaramu"
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#, fuzzy
+msgid "Initial State"
+msgstr "Umubare watangiye:"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#, fuzzy
+msgid "End State"
+msgstr "Impera "
+
 #: listpopupmenu.cpp:1032
 #, fuzzy
 msgid "State..."
 msgstr "leta:"
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#, fuzzy
+msgid "Initial Activity"
+msgstr "Umurimo"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#, fuzzy
+msgid "End Activity"
+msgstr "Impera "
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -2145,6 +2506,14 @@ msgstr "Gusiba ibara"
 msgid "Change Association Name..."
 msgstr "Hindura indanganturo..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 #, fuzzy
 msgid "Clear Diagram"
@@ -2183,8 +2552,8 @@ 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
@@ -2192,217 +2561,113 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "( C ) , ( C ) - "
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-#, fuzzy
-msgid "Incorrect use of associations."
-msgstr "Koresha Bya . "
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-#, fuzzy
-msgid "Association Error"
-msgstr "Ikosa "
-
-#: folder.cpp:289
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "%1 OYA . "
-
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Idosiye ntishobora gufungurwa"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
-"NSENGIYUMVA"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
-"ndonatienuk@yahoo.co.uk"
-
-#: 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 "Cyiteguye."
-
-#: 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
+#: model_utils.cpp:244
 #, fuzzy
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "i Ingano: %1 A Cyangwa A Urwego: ? "
+msgid "new_actor"
+msgstr "Umubarwa"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
+#: model_utils.cpp:246
+msgid "new_usecase"
 msgstr ""
 
-#: codeimport/import_utils.cpp:183
-#, fuzzy
-msgid "Namespace"
-msgstr "Imyanyazina"
-
-#: codeimport/classimport.cpp:34
-#, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Idosiye : %1 "
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Ikosa ry'imbere"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-#, fuzzy
-msgid "Syntax Error before '%1'"
-msgstr "Ikosa Mbere ' %1 ' "
-
-#: codeimport/kdevcppparser/errors.cpp:25
+#: model_utils.cpp:248
 #, fuzzy
-msgid "Parse Error before '%1'"
-msgstr "Ikosa Mbere ' %1 ' "
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
+msgid "new_package"
+msgstr "Porogaramu"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
+#: model_utils.cpp:250
 #, fuzzy
-msgid "expression expected"
-msgstr "imvugo Ikitezwe: $(ARG1) "
+msgid "new_component"
+msgstr "Ibikubiyemo bishya"
 
-#: codeimport/kdevcppparser/parser.cpp:598
+#: model_utils.cpp:252
 #, fuzzy
-msgid "Declaration syntax error"
-msgstr "Ikosa "
+msgid "new_node"
+msgstr "Bidasobetse"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
+#: model_utils.cpp:254
 #, fuzzy
-msgid "} expected"
-msgstr "}Itegerejwe:</%S>."
+msgid "new_artifact"
+msgstr "Ibyatanzwe_X bishya"
 
-#: codeimport/kdevcppparser/parser.cpp:684
+#: model_utils.cpp:256
 #, fuzzy
-msgid "namespace expected"
-msgstr "Ikitezwe: $(ARG1) "
+msgid "new_interface"
+msgstr "Imigaragarire"
 
-#: codeimport/kdevcppparser/parser.cpp:688
+#: model_utils.cpp:258
 #, fuzzy
-msgid "{ expected"
-msgstr "{Itegerejwe:</%S>."
+msgid "new_datatype"
+msgstr "Ibyatanzwe_X bishya"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
+#: model_utils.cpp:260
 #, fuzzy
-msgid "Namespace name expected"
-msgstr "Izina: Ikitezwe: $(ARG1) "
+msgid "new_enum"
+msgstr "Ibikubiyemo Bishya"
 
-#: codeimport/kdevcppparser/parser.cpp:869
+#: model_utils.cpp:262
 #, fuzzy
-msgid "Need a type specifier to declare"
-msgstr "A Ubwoko: Kuri "
+msgid "new_entity"
+msgstr "Ikiranga"
 
-#: codeimport/kdevcppparser/parser.cpp:938
+#: model_utils.cpp:264
 #, fuzzy
-msgid "expected a declaration"
-msgstr "Ikitezwe: $(ARG1) A "
+msgid "new_folder"
+msgstr "Bidasobetse"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
 #, fuzzy
-msgid "Constant expression expected"
-msgstr "imvugo Ikitezwe: $(ARG1) "
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' ntigatunguranye"
+msgid "new_association"
+msgstr "Ishyirahamwe"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
+#: model_utils.cpp:268
 #, fuzzy
-msgid "} missing"
-msgstr "}kibura."
+msgid "new_object"
+msgstr "Kwinjizamo ikintu"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-#, fuzzy
-msgid "Member initializers expected"
-msgstr "Ikitezwe: $(ARG1) "
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-#, fuzzy
-msgid "Base class specifier expected"
-msgstr "Base Urwego: Ikitezwe: $(ARG1) "
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "kirimo ubusa"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
+#: model_utils.cpp:559
 #, fuzzy
-msgid "Initializer clause expected"
-msgstr "Ikitezwe: $(ARG1) "
-
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Ikiranga ntigitunguranye"
+msgid "Malformed argument"
+msgstr "Inkoresha siyo"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
+#: model_utils.cpp:560
 #, fuzzy
-msgid "Type id expected"
-msgstr "ID Ikitezwe: $(ARG1) "
+msgid "Unknown argument type"
+msgstr "Ubwoko: "
 
-#: codeimport/kdevcppparser/parser.cpp:2374
+#: model_utils.cpp:560
 #, fuzzy
-msgid "Class name expected"
-msgstr "Izina: Ikitezwe: $(ARG1) "
+msgid "Illegal method name"
+msgstr "Uburyo Izina: "
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
+#: model_utils.cpp:561
 #, fuzzy
-msgid "condition expected"
-msgstr "Ibisabwa Ikitezwe: $(ARG1) "
+msgid "Unknown return type"
+msgstr "Garuka Ubwoko: "
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
+#: model_utils.cpp:561
 #, fuzzy
-msgid "statement expected"
-msgstr "Inyandiko Ikitezwe: $(ARG1) "
+msgid "Unspecified error"
+msgstr "Ikosa "
 
-#: codeimport/kdevcppparser/parser.cpp:2705
+#: object_factory.cpp:164
 #, fuzzy
-msgid "for initialization expected"
-msgstr "ya:  Itangiza... Ikitezwe: $(ARG1) "
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "ni A Ijambo-banze ya:  i Ururimi: Bya i Inyandikoporogaramu . "
 
-#: codeimport/kdevcppparser/parser.cpp:3273
+#: object_factory.cpp:165
 #, fuzzy
-msgid "catch expected"
-msgstr "Ikitezwe: $(ARG1) "
+msgid "Reserved Keyword"
+msgstr "Imvugo idakorwaho"
 
 #: objectwidget.cpp:90
 #, fuzzy
@@ -2419,123 +2684,79 @@ msgstr "Igikoresho Izina: : "
 msgid "new_parameter"
 msgstr "Ikintu"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Amahitamo Rusange"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "ni A "
-
-#: codegenerators/cppcodegenerationform.cpp:41
-#, fuzzy
-msgid "Virtual destructors"
-msgstr "Name=Ibiro Bitagaragara"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-#, fuzzy
-msgid "Generate empty constructors"
-msgstr "ubusa "
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
-
-#: codegenerators/cppcodegenerationform.cpp:50
-#, fuzzy
-msgid "Operations are inline"
-msgstr "Mumurongo "
-
-#: codegenerators/cppcodegenerationform.cpp:53
-#, fuzzy
-msgid "Accessors are inline"
-msgstr "Mumurongo "
-
-#: codegenerators/cppcodegenerationform.cpp:57
-#, fuzzy
-msgid "Accessors are public"
-msgstr "public "
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr ""
-
-#: umlview.cpp:2578
+#: refactoring/refactoringassistant.cpp:289
 #, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Kwinjiza irinda zina:"
+msgid "Add Base Class"
+msgstr "Base "
 
-#: umlview.cpp:2579
+#: refactoring/refactoringassistant.cpp:290
 #, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "i Gishya Izina: Bya i : "
+msgid "Add Derived Class"
+msgstr "Kongeraho Mucapyi/Urwego..."
 
-#: umlview.cpp:2736
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
 #, fuzzy
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr "Urabyemeyekoko."
+msgid "Add Operation"
+msgstr "Ongera amahitamo"
 
-#: umlview.cpp:2738
-#, fuzzy
-msgid "Delete Diagram?"
-msgstr "Gusiba ibyatanzwe?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Kongeraho Ikiranga"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+#: refactoring/refactoringassistant.cpp:297
 #, fuzzy
-msgid "Rename canceled"
-msgstr "Kureka "
+msgid "Add Base Interface"
+msgstr "Base "
 
-#: umllistviewitem.cpp:468
+#: refactoring/refactoringassistant.cpp:298
 #, fuzzy
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Ikintu Bya Ubwoko: %1 ni OYA . "
+msgid "Add Derived Interface"
+msgstr "Ahagenewe Ukoresha"
 
-#: umllistviewitem.cpp:469
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
 #, fuzzy
-msgid "Function Not Implemented"
-msgstr "Igikorwa nticyashobotse"
+msgid "Base Classifiers"
+msgstr "Base "
 
-#: umllistviewitem.cpp:478
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Izina: Bitemewe . \n"
-"Kureka . "
+msgid "Derived Classifiers"
+msgstr "Ubakoresha Batemerewe"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
 #, fuzzy
-msgid "new_association"
-msgstr "Ishyirahamwe"
+msgid "Enter State Name"
+msgstr "Kwinjiza izina:"
 
-#: umlcanvasobject.cpp:150
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
 #, fuzzy
-msgid "new_attribute"
-msgstr "Ibiranga umurongo"
+msgid "Enter the name of the new state:"
+msgstr "i Izina: Bya i Gishya Leta : "
 
-#: umlcanvasobject.cpp:153
+#: statewidget.cpp:176
 #, fuzzy
-msgid "new_template"
-msgstr "Inyandikorugero nshya"
+msgid "Enter Activity"
+msgstr "Umurimo"
 
-#: umlcanvasobject.cpp:156
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_operation"
-msgstr "Igikorwa"
+msgid "Incorrect use of associations."
+msgstr "Koresha Bya . "
 
-#: umlcanvasobject.cpp:159
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_literal"
-msgstr "By'imbere"
+msgid "Association Error"
+msgstr "Ikosa "
 
-#: umlcanvasobject.cpp:162
+#: toolbarstateother.cpp:148 umlview.cpp:2511
 #, fuzzy
-msgid "new_field"
-msgstr "umwanya"
+msgid "new state"
+msgstr "Gishya Leta "
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2722,11 +2943,6 @@ msgstr "Nka ... "
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Nka "
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "Indangabintu"
-
 #: uml.cpp:286
 #, fuzzy
 msgid "&Zoom Slider"
@@ -2822,6 +3038,13 @@ msgstr "Inyandiko"
 msgid "Opening file..."
 msgstr "Idosiye ... "
 
+#: 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
 #, fuzzy
 msgid "Creating new document..."
@@ -2829,8 +3052,8 @@ msgstr "Gishya Inyandiko ... "
 
 #: 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"
@@ -2859,6 +3082,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid ""
@@ -2868,6 +3095,10 @@ msgstr ""
 "Idosiye %1 . \n"
 "Kuri Guhindura ? "
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Gusimbuza"
@@ -2909,11 +3140,11 @@ msgstr "Ububikokoporora Ibigize ... "
 #: uml.cpp:849
 #, fuzzy
 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 ""
-"OYA Komeka i Ububikokoporora Ibigize . Ibintu in i Ububikokoporora Gicurasi Bya "
-"i Ubwoko: Kuri . "
+"OYA Komeka i Ububikokoporora Ibigize . Ibintu in i Ububikokoporora Gicurasi "
+"Bya i Ubwoko: Kuri . "
 
 #: uml.cpp:863
 #, fuzzy
@@ -2976,1485 +3207,1353 @@ msgstr "Amadosiye yose"
 msgid "Select Code to Import"
 msgstr "Kuri "
 
-#: dialogs/classgenpage.cpp:50
-#, fuzzy
-msgid "Class &name:"
-msgstr "izina y'ubwoko"
-
-#: dialogs/classgenpage.cpp:52
+#: umlcanvasobject.cpp:150
 #, fuzzy
-msgid "Actor &name:"
-msgstr "Izina: : "
+msgid "new_attribute"
+msgstr "Ibiranga umurongo"
 
-#: dialogs/classgenpage.cpp:54
+#: umlcanvasobject.cpp:153
 #, fuzzy
-msgid "Package &name:"
-msgstr "Izina: : "
+msgid "new_template"
+msgstr "Inyandikorugero nshya"
 
-#: dialogs/classgenpage.cpp:56
+#: umlcanvasobject.cpp:156
 #, fuzzy
-msgid "Use case &name:"
-msgstr "Izina: : "
+msgid "new_operation"
+msgstr "Igikorwa"
 
-#: dialogs/classgenpage.cpp:58
+#: umlcanvasobject.cpp:159
 #, fuzzy
-msgid "Interface &name:"
-msgstr "Izina: : "
+msgid "new_literal"
+msgstr "By'imbere"
 
-#: dialogs/classgenpage.cpp:60
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Component &name:"
-msgstr "Izina: : "
+msgid "new_field"
+msgstr "umwanya"
 
-#: dialogs/classgenpage.cpp:62
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "Artifact &name:"
-msgstr "Izina: : "
+msgid "UML Model"
+msgstr "Urugero"
 
-#: dialogs/classgenpage.cpp:64
+#: umldoc.cpp:106
 #, fuzzy
-msgid "Enum &name:"
-msgstr "Izina: : "
+msgid "Logical View"
+msgstr "Bijyanye n'inyurabwenge"
 
-#: dialogs/classgenpage.cpp:66
+#: umldoc.cpp:107
 #, fuzzy
-msgid "Datatype &name:"
-msgstr "Izina: : "
+msgid "Use Case View"
+msgstr "Gufunga igaragaza Ngenga"
 
-#: dialogs/classgenpage.cpp:68
+#: umldoc.cpp:108
 #, fuzzy
-msgid "Entity &name:"
-msgstr "Izina: : "
+msgid "Component View"
+msgstr "Igaragaza ry'ibikubiyemo"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#: umldoc.cpp:109
 #, fuzzy
-msgid "&Stereotype name:"
-msgstr "Izina: : "
+msgid "Deployment View"
+msgstr "Igaragaza nyandiko"
 
-#: dialogs/classgenpage.cpp:107
-#, fuzzy
-msgid "&Package name:"
-msgstr "Izina: : "
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:121
+#: umldoc.cpp:117 umldoc.cpp:293
 #, fuzzy
-msgid "A&bstract class"
-msgstr "Urwego: "
+msgid "Datatypes"
+msgstr "Ubwoko bw'ibyatanzwe"
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:229
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "Koresha "
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr "Idosiyeirihoyahinduwe."
 
-#: dialogs/classgenpage.cpp:131
+#: umldoc.cpp:355
 #, fuzzy
-msgid "&Executable"
-msgstr "Bitangizwa:"
+msgid "The file %1 does not exist."
+msgstr "Idosiye\"%1\"ntibaho."
 
-#: dialogs/classgenpage.cpp:138
+#: umldoc.cpp:380
 #, fuzzy
-msgid "Draw As"
-msgstr "Gushushanya"
+msgid "The file %1 seems to be corrupted."
+msgstr "Idosiye %1 Kuri . "
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Mburabuzi"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, fuzzy, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Oya Idosiye Byabonetse in i Byegeranijwe Idosiye %1 . "
 
-#: dialogs/classgenpage.cpp:149
-#, fuzzy
-msgid "&Library"
-msgstr "Isomero"
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "A Ifungura i Idosiye : %1 "
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "Imbonerahamwe"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy, c-format
+msgid "There was a problem loading file: %1"
+msgstr "A Ifungura Idosiye : %1 "
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-#, fuzzy
-msgid "P&ublic"
-msgstr "Rusange"
+#: umldoc.cpp:641
+#, fuzzy, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "A Koherezayo %1 Idosiye : %1 "
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
+#: umldoc.cpp:934
 #, fuzzy
-msgid "P&rivate"
-msgstr "By'umwihariko"
+msgid "use case diagram"
+msgstr "Koresha "
 
-#: dialogs/classgenpage.cpp:182
+#: umldoc.cpp:936
 #, fuzzy
-msgid "Pro&tected"
-msgstr "Birinzwe"
+msgid "class diagram"
+msgstr "Urwego: "
 
-#: dialogs/classgenpage.cpp:186
+#: umldoc.cpp:938
 #, fuzzy
-msgid "Imple&mentation"
-msgstr "Inyandiko"
+msgid "sequence diagram"
+msgstr "Igenzura ry'icyiciro"
 
-#: dialogs/classgenpage.cpp:256
-#, fuzzy
-msgid "Class name:"
-msgstr "izina y'ubwoko"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#: umldoc.cpp:942
 #, fuzzy
-msgid "Instance name:"
-msgstr "Izina ry'Urugero"
+msgid "state diagram"
+msgstr "Leta "
 
-#: dialogs/classgenpage.cpp:272
+#: umldoc.cpp:944
 #, fuzzy
-msgid "Draw as actor"
-msgstr "Nka Umukinnyi "
+msgid "activity diagram"
+msgstr "Umurimo "
 
-#: dialogs/classgenpage.cpp:277
+#: umldoc.cpp:946
 #, fuzzy
-msgid "Multiple instance"
-msgstr "Urugero "
+msgid "component diagram"
+msgstr "Umurongo w'inyangingo"
 
-#: dialogs/classgenpage.cpp:284
-#, fuzzy
-msgid "Show destruction"
-msgstr "Kwerekana ibiro "
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:322
-#, fuzzy
-msgid "Component name:"
-msgstr "Izina: : "
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:324
+#: umldoc.cpp:984 umldoc.cpp:1017
 #, fuzzy
-msgid "Node name:"
-msgstr "Izina: : "
+msgid "That is an invalid name for a diagram."
+msgstr "ni Bitemewe Izina: ya:  A . "
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
+#: umldoc.cpp:998 umldoc.cpp:1025
 #, fuzzy
-msgid "Stereotype name:"
-msgstr "Izina: : "
+msgid "A diagram is already using that name."
+msgstr "A ni ikoresha Izina: . "
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 #, fuzzy
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Izina: Byakoreshejwe . \n"
-"Izina: Kugarura . "
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-#, fuzzy
-msgid "Name is Not Unique"
-msgstr "ni "
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-#, fuzzy
-msgid "&Line:"
-msgstr "Umurongo:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-#, fuzzy
-msgid "&Fill:"
-msgstr "Kuzuza"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-#, fuzzy
-msgid "D&efault"
-msgstr "Mburabuzi"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-#, fuzzy
-msgid "&Use fill"
-msgstr "Kuzuza "
+"Izina: OYA Cyo nyine . \n"
+"iyi ? "
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "Activities"
-msgstr "Umurimo"
+msgid "Use Name"
+msgstr "Izinakoresha"
 
-#: dialogs/activitypage.cpp:72
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "New Activity..."
-msgstr "Umurimo"
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Guhindura izina"
+msgid "Enter New Name"
+msgstr "Kwinjiza izina:"
 
-#: dialogs/activitypage.cpp:134
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "New Activity"
-msgstr "Umurimo"
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Kuri Gusiba %1 ? "
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "Rename Activity"
-msgstr "Umurimo"
+msgid "Delete Diagram"
+msgstr "Gusiba Ikadiri"
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1573
 #, fuzzy
-msgid "Enter the new name of the activity:"
-msgstr "i Gishya Izina: Bya i Umurimo : "
+msgid "Setting up the document..."
+msgstr "Hejuru i Inyandiko ... "
 
-#: dialogs/assocpropdlg.cpp:39
+#: umldoc.cpp:1600
 #, fuzzy
-msgid "Association Properties"
-msgstr "Indangabintu y'ihuriro"
-
-#: 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 "Igenamiterere rusange"
+msgid "Resolving object references..."
+msgstr "Igikoresho Indango ... "
 
-#: dialogs/assocpropdlg.cpp:94
+#: umldoc.cpp:1638
 #, fuzzy
-msgid "Roles"
-msgstr "Inshingano"
+msgid "Loading UML elements..."
+msgstr "Ibintu ... "
 
-#: dialogs/assocpropdlg.cpp:94
+#: umldoc.cpp:1811
 #, fuzzy
-msgid "Role Settings"
-msgstr "Amagenamiterere y'ububiko"
+msgid "Loading diagrams..."
+msgstr "Mu gufungura imigereka..."
 
-#: 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 "Amagenamiterere y'Imyandikire"
+#: umldoc.cpp:2104
+#, fuzzy, c-format
+msgid "/autosave%1"
+msgstr "/NyaMwishyingura %1 "
 
-#: dialogs/assocpropdlg.cpp:112
+#: umllistview.cpp:348
 #, fuzzy
-msgid "Association font"
-msgstr "Imyandikire "
+msgid "Externalize Folder"
+msgstr "Ububiko bwihariye"
 
-#: dialogs/umltemplatedialog.cpp:36
+#: umllistview.cpp:416
 #, fuzzy
-msgid "Template Properties"
-msgstr "Indangabintu y'ishusho"
-
-#: 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 "Ibirangakintu Rusange"
-
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Ubwoko:"
-
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "Izina:"
+msgid "Enter Model Name"
+msgstr "Kwinjiza izina ry'ububiko rishya:"
 
-#: dialogs/umltemplatedialog.cpp:128
+#: umllistview.cpp:417
 #, fuzzy
-msgid "You have entered an invalid template name."
-msgstr "Bitemewe Nyandiko-rugero Izina: . "
+msgid "Enter the new name of the model:"
+msgstr "i Gishya Izina: Bya i Urugero : "
 
-#: dialogs/umltemplatedialog.cpp:129
+#: umllistview.cpp:1007
 #, fuzzy
-msgid "Template Name Invalid"
-msgstr "Izina ry'Inyandikorugero:"
+msgid "Views"
+msgstr "Igaragaza"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 #, fuzzy
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Nyandiko-rugero Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
-
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "Izina ry'Inyandikorugero:"
-
-#: dialogs/umlentityattributedialog.cpp:43
-#, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Indangabintu y'Umwanya w'Umwandiko "
-
-#: dialogs/umlentityattributedialog.cpp:73
-#, fuzzy
-msgid "&Default value:"
-msgstr "Agaciro mburabuzi"
-
-#: dialogs/umlentityattributedialog.cpp:81
-#, fuzzy
-msgid "Length/Values:"
-msgstr "Uburebure:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-#, fuzzy
-msgid "&Auto increment"
-msgstr "Iyongeragaciro "
-
-#: dialogs/umlentityattributedialog.cpp:88
-#, fuzzy
-msgid "Allow &null"
-msgstr "NTAGIHARI "
-
-#: dialogs/umlentityattributedialog.cpp:92
-#, fuzzy
-msgid "Attributes:"
-msgstr "Ibiranga..."
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "gushyiraho umugereka"
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "Ntana kimwe"
-
-#: dialogs/umlentityattributedialog.cpp:115
-#, fuzzy
-msgid "&Primary"
-msgstr "Agenga"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Umubarendanga"
-
-#: dialogs/umlentityattributedialog.cpp:121
-#, fuzzy
-msgid "&Unique"
-msgstr "Cyo nyine"
-
-#: dialogs/umlentityattributedialog.cpp:184
-#, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "Bitemewe Ikiranga: Izina: . "
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Izina: Bitemewe . \n"
+"Kureka . "
 
-#: dialogs/umlentityattributedialog.cpp:185
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
 #, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "Guhindura Ikiranga"
+msgid "Name Not Valid"
+msgstr "Izin&a kuri karita:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistview.cpp:1923 umllistview.cpp:2160
 #, fuzzy
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
+"Izina: OYA Cyo nyine ! \n"
+"Kureka . "
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Kugaragaza"
-
-#: dialogs/umlviewdialog.cpp:93
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
 #, fuzzy
-msgid "Classes Display Options"
-msgstr "Kwerekana amahitamo"
+msgid "Creation canceled"
+msgstr "Kureka "
 
-#: dialogs/umlviewdialog.cpp:100
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Diagram Colors"
-msgstr "Dim Color"
+msgid "Loading listview..."
+msgstr "Gufungura Ubutumwa..."
 
-#: dialogs/umlviewdialog.cpp:164
+#: umllistview.cpp:2670
 #, fuzzy
-msgid "The name you have entered is invalid."
-msgstr "Izina: ni Bitemewe . "
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Ububiko... Mbere Kyasibwe: %S . "
 
-#: dialogs/umlviewdialog.cpp:170
+#: umllistview.cpp:2671
 #, fuzzy
-msgid "The name you have entered is not unique."
-msgstr "Izina: ni OYA Cyo nyine . "
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Ubwoko:"
+msgid "Folder Not Empty"
+msgstr "Ububiko ntibufite ubusa"
 
-#: dialogs/settingsdlg.cpp:30
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
 #, fuzzy
-msgid "Umbrello Setup"
-msgstr "Iboneza rya Porogisi"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Ahagenewe Ukoresha"
+msgid "Rename canceled"
+msgstr "Kureka "
 
-#: dialogs/settingsdlg.cpp:47
+#: umllistviewitem.cpp:468
 #, fuzzy
-msgid "User Interface Settings"
-msgstr "Amagenamiterere y'Imigaragarire"
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Ikintu Bya Ubwoko: %1 ni OYA . "
 
-#: dialogs/settingsdlg.cpp:54
+#: umllistviewitem.cpp:469
 #, fuzzy
-msgid "Line color:"
-msgstr "Ibara ry'umurongo"
+msgid "Function Not Implemented"
+msgstr "Igikorwa nticyashobotse"
 
-#: dialogs/settingsdlg.cpp:60
+#: umllistviewitem.cpp:478
 #, fuzzy
-msgid "D&efault Color"
-msgstr "Amabara mburabuzi"
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Izina: Bitemewe . \n"
+"Kureka . "
 
-#: dialogs/settingsdlg.cpp:63
-#, fuzzy
-msgid "Fill color:"
-msgstr "Ibara ryo kuzuza"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:69
+#: umlview.cpp:2578
 #, fuzzy
-msgid "De&fault Color"
-msgstr "Amabara mburabuzi"
+msgid "Enter Diagram Name"
+msgstr "Kwinjiza irinda zina:"
 
-#: dialogs/settingsdlg.cpp:73
+#: umlview.cpp:2579
 #, fuzzy
-msgid "Line width:"
-msgstr "Ubugari bw'Umurongo"
+msgid "Enter the new name of the diagram:"
+msgstr "i Gishya Izina: Bya i : "
 
-#: dialogs/settingsdlg.cpp:81
+#: umlview.cpp:2736
 #, fuzzy
-msgid "D&efault Width"
-msgstr "Itariki mburabuzi"
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr "Urabyemeyekoko."
 
-#: dialogs/settingsdlg.cpp:86
+#: umlview.cpp:2738
 #, fuzzy
-msgid "&Use fill color"
-msgstr "Kuzuza Ibara: "
+msgid "Delete Diagram?"
+msgstr "Gusiba ibyatanzwe?"
 
-#: dialogs/settingsdlg.cpp:108
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Enable undo"
-msgstr "Isubiranyuma "
+msgid "Exporting view..."
+msgstr "Tegereza..."
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
+#: umlviewimageexporter.cpp:66
 #, fuzzy
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Gishya + + //"
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr "Wifuzakurisimbura."
 
-#: dialogs/settingsdlg.cpp:120
-#, fuzzy
-msgid "Use angular association lines"
-msgstr "Ishyirahamwe Umwanya Ingano: : "
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Idosiye isanzwe ihari"
 
-#: dialogs/settingsdlg.cpp:126
-#, fuzzy
-msgid "Autosave"
-msgstr "NyaMwishyingura"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Isubiranyuma: Kurema Ububiko"
 
-#: dialogs/settingsdlg.cpp:132
+#: umlviewimageexportermodel.cpp:145
 #, fuzzy
-msgid "E&nable autosave"
-msgstr "NyaMwishyingura "
+msgid "Can not save an empty diagram"
+msgstr "OYA Kubika ubusa "
 
-#: dialogs/settingsdlg.cpp:136
-#, fuzzy
-msgid "Select auto-save time interval (mins):"
-msgstr "Ikiyega - Kubika Igihe Intera ( ) : "
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:146
-#, fuzzy
-msgid "Set autosave suffix:"
-msgstr "NyaMwishyingura Ingereka : "
+#: 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:148
+#: umlwidgetcontroller.cpp:379
 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>"
+"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:158
-msgid "Startup"
-msgstr "Gutangira "
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Igikoresho"
 
-#: dialogs/settingsdlg.cpp:164
+#: worktoolbar.cpp:246
 #, fuzzy
-msgid "Sta&rtup logo"
-msgstr "ikirango "
+msgid "Synchronous Message"
+msgstr "Ubutumwa Bubanza"
 
-#: dialogs/settingsdlg.cpp:168
+#: worktoolbar.cpp:247
 #, fuzzy
-msgid "&Tip of the day"
-msgstr "Ingingo y'umunsi"
+msgid "Asynchronous Message"
+msgstr "ikintu kitaboneka ako kanya"
 
-#: dialogs/settingsdlg.cpp:172
-#, fuzzy
-msgid "&Load last project"
-msgstr "Iheruka Umushinga "
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Akarango"
 
-#: dialogs/settingsdlg.cpp:176
-#, fuzzy
-msgid "Start new project with:"
-msgstr "Gutangira Gishya Umushinga Na: : "
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Igisobanuro"
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "No Diagram"
-msgstr "Nta gusimbuka amapaje"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Agasanduku"
 
-#: dialogs/settingsdlg.cpp:183
+#: worktoolbar.cpp:257
 #, fuzzy
-msgid "Class Diagram"
-msgstr "Ikiranga urwego"
-
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr ""
+msgid "Relationship"
+msgstr "Amasano"
 
-#: dialogs/settingsdlg.cpp:184
+#: worktoolbar.cpp:258
 #, fuzzy
-msgid "Sequence Diagram"
-msgstr "Igenzura ry'icyiciro"
+msgid "Directional Association"
+msgstr "Icapa byerekezobibiri"
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "Collaboration Diagram"
-msgstr "Ibyatanzwe by'Iboneza"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
+#: worktoolbar.cpp:275
 #, fuzzy
-msgid "State Diagram"
-msgstr "Gukora Ikinyampande"
+msgid "Deep History"
+msgstr "Gusiba Amateka"
 
-#: dialogs/settingsdlg.cpp:186
+#: worktoolbar.cpp:276
 #, fuzzy
-msgid "Activity Diagram"
-msgstr "Ikyerekana igikorwa"
+msgid "Shallow History"
+msgstr "Kubika Amateka"
 
-#: dialogs/settingsdlg.cpp:186
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Component Diagram"
-msgstr "Umurongo w'inyangingo"
-
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr ""
+msgid "Join"
+msgstr "ku"
 
-#: dialogs/settingsdlg.cpp:210
+#: worktoolbar.cpp:278
 #, fuzzy
-msgid "Class Settings"
-msgstr "Amagenamiterere y'Amabara"
+msgid "Fork"
+msgstr "Ifishi"
 
-#: dialogs/settingsdlg.cpp:217
+#: worktoolbar.cpp:279
 #, fuzzy
-msgid "Show &visibility"
-msgstr "Ukugaragara "
+msgid "Junction"
+msgstr "Umumaro"
 
-#: dialogs/settingsdlg.cpp:221
+#: worktoolbar.cpp:280
 #, fuzzy
-msgid "Show attributes"
-msgstr "Ibiranga "
+msgid "Choice"
+msgstr "Ijwi"
 
-#: dialogs/settingsdlg.cpp:225
+#: worktoolbar.cpp:285
 #, fuzzy
-msgid "Show operations"
-msgstr "Ibikorwa: "
+msgid "Activity Transition"
+msgstr "InyuranamoRyikoresha"
 
-#: dialogs/settingsdlg.cpp:229
-#, fuzzy
-msgid "Show stereot&ype"
-msgstr "Kwerekana Isesenguranteruro"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Ubutumwa"
 
-#: dialogs/settingsdlg.cpp:233
+#: worktoolbar.cpp:298
 #, fuzzy
-msgid "Show attribute signature"
-msgstr "Ikiranga: Isinya "
+msgid "UNDEFINED"
+msgstr "Bidasobanuye"
 
-#: dialogs/settingsdlg.cpp:238
-#, fuzzy
-msgid "Show package"
-msgstr "Porogaramu "
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Guhitamo"
 
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
-msgstr "Gutangiza serivise"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "Ikiranga: Ingano: : "
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "Igikorwa Ingano: : "
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation"
-msgstr "Comment=Irema ry'Umubarendanga "
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation Settings"
-msgstr "Igenamiterere ry'ihuza"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Ibikorwa: "
 
-#: dialogs/settingsdlg.cpp:301
-#, fuzzy
-msgid "Code Viewer Settings"
-msgstr "Amagenamiterere y'Igaragaza ry'Urutonde"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-#, fuzzy
-msgid "Operation Properties"
-msgstr "Indangabintu y'ibuto"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Gukuraho Ishakisha"
 
-#: dialogs/umloperationdialog.cpp:89
-#, fuzzy
-msgid "&Abstract operation"
-msgstr "Igikorwa "
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-#, fuzzy
-msgid "Classifier &scope (\"static\")"
-msgstr "Ingano: ( \" \" ) "
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Ibisobanuro rusange"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-#, fuzzy
-msgid "Prot&ected"
-msgstr "Birinzwe"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "Inyandiko"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Ishyirahamwe"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Ibigenga"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:141
-#, fuzzy
-msgid "Ne&w Parameter..."
-msgstr "Mucapyi nshya..."
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-#, fuzzy
-msgid "You have entered an invalid parameter name."
-msgstr "Bitemewe Ikintu Izina: . "
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-#, fuzzy
-msgid "Parameter Name Invalid"
-msgstr "Ibigenga Iyingiza"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Mburabuzi"
 
-#: dialogs/umloperationdialog.cpp:339
-#, fuzzy
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr "Ikintu Izina: Byakoreshejwe in iyi Igikorwa . "
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:406
-#, fuzzy
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-#, fuzzy
-msgid "You have entered an invalid operation name."
-msgstr "Bitemewe Igikorwa Izina: . "
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Imisusire"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-#, fuzzy
-msgid "Operation Name Invalid"
-msgstr "Igikorwa nticyashobotse."
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "< p Itunganya = \" Hagati \" > + + </p> "
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-#, fuzzy
-msgid ""
-"An operation with that signature already exists in %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
 msgstr ""
-"Igikorwa Na: Isinya in %1 . \n"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-#, fuzzy
-msgid "Choose a different name or parameter list."
-msgstr "A Izina: Cyangwa Ikintu Urutonde . "
-
-#: dialogs/assocrolepage.cpp:50
-#, fuzzy
-msgid "Role A Properties"
-msgstr "A "
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, fuzzy, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "ya:  Inzego in Inyandikoporogaramu : "
 
-#: dialogs/assocrolepage.cpp:51
-#, fuzzy
-msgid "Role B Properties"
-msgstr "Ibiranga ububiko"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, fuzzy, no-c-format
+msgid "QPtrList"
+msgstr "Urutonde"
 
-#: dialogs/assocrolepage.cpp:68
-#, fuzzy
-msgid "Role A Visibility"
-msgstr "A "
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, fuzzy, no-c-format
+msgid "vector"
+msgstr "Umukinnyi"
 
-#: dialogs/assocrolepage.cpp:69
-#, fuzzy
-msgid "Role B Visibility"
-msgstr "igaragara"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, fuzzy, no-c-format
+msgid "<b>Variable</b>"
+msgstr "Impinduragaciro"
 
-#: dialogs/assocrolepage.cpp:70
-#, fuzzy
-msgid "Role A Changeability"
-msgstr "A "
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, fuzzy, no-c-format
+msgid "QString"
+msgstr "Ikurikiranyanyuguti"
 
-#: dialogs/pkgcontentspage.cpp:29
-#, fuzzy
-msgid "Contained Items"
-msgstr "Kirimo"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "Ikurikiranyanyuguti"
 
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "icyitonderwa "
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
 
-#: dialogs/classifierlistpage.cpp:39
-#, fuzzy
-msgid "N&ew Attribute..."
-msgstr "Guhindura Ibiranga..."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
 
-#: dialogs/classifierlistpage.cpp:42
-#, fuzzy
-msgid "N&ew Operation..."
-msgstr "Isano Rishya..."
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, fuzzy, no-c-format
+msgid "qptrlist.h"
+msgstr ". h "
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Inyandikorugero"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, fuzzy, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i> &Rusange ? </i> "
 
-#: dialogs/classifierlistpage.cpp:45
-#, fuzzy
-msgid "N&ew Template..."
-msgstr "Inyandikorugero nshya"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, fuzzy, no-c-format
+msgid "qstring.h"
+msgstr ". h "
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals"
-msgstr "Impishanyandiko y'inyuguti"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, fuzzy, no-c-format
+msgid "Class name"
+msgstr "izina y'ubwoko"
 
-#: dialogs/classifierlistpage.cpp:48
-#, fuzzy
-msgid "N&ew Enum Literal..."
-msgstr "Mucapyi nshya..."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, fuzzy, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i> < p Itunganya = \" Hagati \" > Idosiye </p> </i> "
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Guhindura Ikiranga"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Project Generation"
+msgstr "Ibisobanuro by'umushinga"
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "Guhindura Ibiranga..."
+#: codegenerators/javacodegenerationformbase.ui:51
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Inyandiko "
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "Initial activity"
-msgstr "Umurimo "
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "&Uburyo bw'Ihamya"
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "End activity"
-msgstr "Impera Umurimo "
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:82
-#, fuzzy
-msgid "Activity type:"
-msgstr "Ubwoko: : "
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:87
-#, fuzzy
-msgid "Activity name:"
-msgstr "Izina: : "
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-#, fuzzy
-msgid "Widget Colors"
-msgstr "&Ibara rya Wijeti"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, fuzzy, no-c-format
+msgid "From Parent Object"
+msgstr "Igikoresho cy'Ifishi"
 
-#: dialogs/umlattributedialog.cpp:42
-#, fuzzy
-msgid "Attribute Properties"
-msgstr "Indangakintu y'imashini-NshyiraRupapuro"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Ikiranga: Ingano: : "
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-#, fuzzy
-msgid "&Initial value:"
-msgstr "Umubare watangiye:"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "Ishyirahamwe Umwanya Ingano: : "
 
-#: dialogs/umlattributedialog.cpp:91
-#, fuzzy
-msgid "&Public"
-msgstr "Rusange"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, fuzzy, no-c-format
+msgid "From Parent Role"
+msgstr "Ububiko Mubyeyi"
 
-#: dialogs/umlattributedialog.cpp:155
-#, fuzzy
-msgid "You have entered an invalid attribute name."
-msgstr "Bitemewe Ikiranga: Izina: . "
+#: codegenerators/javacodegenerationformbase.ui:269
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
 
-#: dialogs/umlattributedialog.cpp:156
-#, fuzzy
-msgid "Attribute Name Invalid"
-msgstr "izina y'ikiranga"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, fuzzy, no-c-format
+msgid "Hash (#)"
+msgstr "Akanyerezo (Bitsindagiye)"
 
-#: dialogs/umlattributedialog.cpp:163
-#, fuzzy
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, fuzzy, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "- Impera ( = = Impera ) "
 
-#: dialogs/umlattributedialog.cpp:164
-#, fuzzy
-msgid "Attribute Name Not Unique"
-msgstr "izina y'ikiranga"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "Kugena Ibikorwa"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Ururimi"
 
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "Umubare : "
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Ububiko"
 
-#: dialogs/selectopdlg.cpp:46
-#, fuzzy
-msgid "Class operation:"
-msgstr "Igikorwa : "
+#: dialogs/codegenerationoptionsbase.ui:110
+#, fuzzy, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Byose Idosiye Kuri Ububiko... : "
 
-#: dialogs/selectopdlg.cpp:54
-#, fuzzy
-msgid "Custom operation:"
-msgstr "Kunozaidosiyeya Igikorwa : "
+#: dialogs/codegenerationoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Bro&wse..."
+msgstr "Gushakisha..."
 
-#: dialogs/diagramprintpage.cpp:35
-#, fuzzy
-msgid "&Diagrams"
-msgstr "Ibiganiro"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, fuzzy, no-c-format
+msgid "B&rowse..."
+msgstr "Gushakisha..."
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Muyunguruzi"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "Umutwempangano Idosiye Kuva: Ububiko... : "
 
-#: dialogs/diagramprintpage.cpp:48
-#, fuzzy
-msgid "&Current diagram"
-msgstr "Iki Gihe"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, fuzzy, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "ku Kuri iyi Ububiko... "
 
-#: dialogs/diagramprintpage.cpp:53
-#, fuzzy
-msgid "&All diagrams"
-msgstr "Paji zose"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, fuzzy, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"in iyi Ububiko... Byakoreshejwe Nka Umutwempangano Idosiye in i "
+"Inyandikoporogaramu "
 
-#: dialogs/diagramprintpage.cpp:57
-#, fuzzy
-msgid "&Select diagrams"
-msgstr "Guhitamo ububikoshingiro"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, fuzzy, no-c-format
+msgid "Overwrite Policy"
+msgstr "Gusimbuza "
 
-#: dialogs/diagramprintpage.cpp:61
-#, fuzzy
-msgid "&Type of diagram"
-msgstr "Bya "
+#: dialogs/codegenerationoptionsbase.ui:214
+#, fuzzy, 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 ""
+"A Idosiye Na: i Izina: Nka i Izina: Inyandikoporogaramu \n"
+"Kuri Koresha Nka Ibisohoka Idosiye : "
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Ihitamo"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, fuzzy, no-c-format
+msgid "O&verwrite"
+msgstr "Guhindura"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-#, fuzzy
-msgid "Collaboration"
-msgstr "Ishyiramo rumuri"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, fuzzy, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Gusimbuza Idosiye NIBA in i Ishyika: Ububiko... "
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-#, fuzzy
-msgid "Sequence"
-msgstr "Ubwisubire"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, fuzzy, no-c-format
+msgid "As&k"
+msgstr "Kubaza"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "ikigize"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, fuzzy, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "A Idosiye Na: i Izina: , ask Kuri "
 
-#: dialogs/diagramprintpage.cpp:135
-#, fuzzy
-msgid "No diagrams selected."
-msgstr "Byahiswemo . "
+#: dialogs/codegenerationoptionsbase.ui:248
+#, fuzzy, no-c-format
+msgid "&Use a different name"
+msgstr "A Izina: "
 
-#: dialogs/classpropdlg.cpp:118
-#, fuzzy
-msgid "Display Options"
-msgstr "Kwerekana amahitamo"
+#: dialogs/codegenerationoptionsbase.ui:251
+#, fuzzy, 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 ""
+"A Idosiye in i Ishyika: Ububiko... , Guhitamo A Izina: Kuri Koresha ku "
+"Wongera A Ingereka Kuri i Idosiye Izina: "
 
-#: dialogs/classpropdlg.cpp:179
-#, fuzzy
-msgid "Attribute Settings"
-msgstr "Imikorereshereje Ya Mucapyi"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Ihinduramiterere"
 
-#: dialogs/classpropdlg.cpp:187
-#, fuzzy
-msgid "Operation Settings"
-msgstr "Amagenamiterere mburabuzi"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Imirongo"
 
-#: dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates Settings"
-msgstr "Amagenamiterere y'Umwandiko"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "Imisusire : "
 
-#: dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals Settings"
-msgstr "Igenamiterere rusange"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, fuzzy, no-c-format
+msgid "Indentation type:"
+msgstr "Ubwoko: : "
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Guhindura ibyashizweho bishiraho ikizere:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, fuzzy, no-c-format
+msgid "Indentation amount:"
+msgstr "Igiteranyo  : "
 
-#: dialogs/classpropdlg.cpp:216
-#, fuzzy
-msgid "Contents Settings"
-msgstr "Amagenamiterere y'Imyandikire"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, fuzzy, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
+"* ( \" \n"
+"n \" ) "
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Associations"
-msgstr "Ishyirahamwe"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr ""
+"( \" \\r \n"
+"n \" ) "
 
-#: dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Class Associations"
-msgstr "aho ishuri riri"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, fuzzy, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "MAC"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-#, fuzzy
-msgid "Operatio&ns"
-msgstr "Ibikorwa"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, fuzzy, no-c-format
+msgid "No Indentation"
+msgstr "Isunika"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-#, fuzzy
-msgid "&Visibility"
-msgstr "Ukugaragara"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Isimbuka"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr "Isinya "
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Umwanya"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-#, fuzzy
-msgid "Pac&kage"
-msgstr "Porogaramu"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, fuzzy, no-c-format
+msgid "Comment Verbosity"
+msgstr "Ibisobanuro"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-#, fuzzy
-msgid "Att&ributes"
-msgstr "Ibiranga"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, fuzzy, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Ibisobanuro ya:  Ibyatoranyijwe ATARIIGIHARWE NIBA Icyiciro \n"
+"ni ubusa "
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-#, fuzzy
-msgid "Stereot&ype"
-msgstr "Ubwoko bw'ibyiciro"
+#: dialogs/codegenerationoptionsbase.ui:436
+#, fuzzy, no-c-format
+msgid ""
+"Writes comments to indicate the different sections (public, private etc) in "
+"a class, even if the sections are empty"
+msgstr ""
+"Ibisobanuro Kuri i Ibyatoranyijwe ( public , By'umwihariko ) in A Urwego: , "
+"ATARIIGIHARWE NIBA i Ibyatoranyijwe ubusa "
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-#, fuzzy
-msgid "Attr&ibute signature"
-msgstr "Isinya "
+#: dialogs/codegenerationoptionsbase.ui:452
+#, fuzzy, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Inyandiko Ibisobanuro ATARIIGIHARWE NIBA ubusa "
 
-#: dialogs/classoptionspage.cpp:108
-#, fuzzy
-msgid "Draw as circle"
-msgstr "Nka Uruziga "
+#: dialogs/codegenerationoptionsbase.ui:455
+#, fuzzy, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Ibisobanuro ya:  Urwego: na Uburyo Inyandiko ATARIIGIHARWE NIBA ubusa "
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "Initial state"
-msgstr "Leta "
+#: dialogs/codegenerationoptionsbase.ui:468
+#, fuzzy, no-c-format
+msgid "Language Options"
+msgstr "Igice Ururimi"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "End state"
-msgstr "Impera Leta "
+#: dialogs/codegenerationwizardbase.ui:16
+#, fuzzy, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Nyobora y'iyerekana"
 
-#: dialogs/statedialog.cpp:96
-#, fuzzy
-msgid "State type:"
-msgstr "Ubwoko: : "
+#: dialogs/codegenerationwizardbase.ui:23
+#, fuzzy, no-c-format
+msgid "Select Classes"
+msgstr "Guhitamo idosiye"
 
-#: dialogs/statedialog.cpp:101
-#, fuzzy
-msgid "State name:"
-msgstr "Izina: : "
+#: dialogs/codegenerationwizardbase.ui:40
+#, fuzzy, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr "Byose i Inzego Kuri in i Iburyo: Urutonde "
 
-#: dialogs/statedialog.cpp:130
-#, fuzzy
-msgid "Widget Color"
-msgstr "Ibara rya Wijeti"
+#: dialogs/codegenerationwizardbase.ui:78
+#, fuzzy, no-c-format
+msgid "Add class for code generation"
+msgstr "Urwego: ya:  Inyandikoporogaramu "
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-#, fuzzy
-msgid "new_class"
-msgstr "Icyiciro cy'igerageza"
+#: dialogs/codegenerationwizardbase.ui:101
+#, fuzzy, no-c-format
+msgid "Classes Selected"
+msgstr "&Kubika Ibyatoranyijwe"
 
-#: dialogs/classwizard.cpp:54
-#, fuzzy
-msgid "New Class"
-msgstr "Icyiciro cy'Igerageza"
+#: dialogs/codegenerationwizardbase.ui:136
+#, fuzzy, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Urwego: Kuva: "
 
-#: dialogs/classwizard.cpp:59
-#, fuzzy
-msgid "Class Attributes"
-msgstr "Ibiranga akadirishya"
+#: dialogs/codegenerationwizardbase.ui:159
+#, fuzzy, no-c-format
+msgid "Classes Available"
+msgstr "I(bi)huzagihe (b)ihari"
 
-#: dialogs/classwizard.cpp:63
-#, fuzzy
-msgid "Class Operations"
-msgstr "Ibikorwa"
+#: dialogs/codegenerationwizardbase.ui:209
+#, fuzzy, no-c-format
+msgid "Code Generation Status"
+msgstr "Imimerere y'ukwihuza"
 
-#: dialogs/parmpropdlg.cpp:35
-#, fuzzy
-msgid "Parameter Properties"
-msgstr "Indangakintu y'imashini-NshyiraRupapuro"
+#: dialogs/codegenerationwizardbase.ui:226
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "i Akabuto Kuri Tangira &vendorShortName; i Inyandikoporogaramu "
 
-#: dialogs/parmpropdlg.cpp:82
-#, fuzzy
-msgid "Passing Direction"
-msgstr "Icyerekerezo cyo gucapa"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, fuzzy, no-c-format
+msgid "Generation Status"
+msgstr "Imimerere y'ukwihuza"
 
-#: dialogs/parmpropdlg.cpp:84
-#, fuzzy
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
-"\" in \" ni A Ikintu , \" Inyuma \" ni A Ikintu na \" \" ni A Ikintu ya:  na . "
+#: dialogs/codeviewerdialogbase.ui:43
+#, fuzzy, no-c-format
+msgid "Show hidden blocks"
+msgstr "Birahishe "
 
-#: dialogs/codegenerationwizard.cpp:70
-#, fuzzy
-msgid "&Generate"
-msgstr "Rusange"
+#: dialogs/codeviewerdialogbase.ui:59
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "< p Itunganya = \" Hagati \" > Izina: </p> "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Kurangiza"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-#, fuzzy
-msgid "Code Generated"
-msgstr "Hejuru hagati"
+#: dialogs/codeviewerdialogbase.ui:86
+#, fuzzy, no-c-format
+msgid "Show block type"
+msgstr "Funga Ubwoko: "
 
-#: dialogs/codegenerationwizard.cpp:134
-#, fuzzy
-msgid "Not Generated"
-msgstr "Bitari hagati"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Amabara"
 
-#: dialogs/codegenerationwizard.cpp:141
-#, fuzzy
-msgid "Not Yet Generated"
-msgstr "Bitari hagati"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Imyandikire:"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Ububiko... %1 OYA . Kuri Kurema NONEAHA ? "
+#: dialogs/codevieweroptionsbase.ui:103
+#, fuzzy, no-c-format
+msgid "Paper:"
+msgstr "urupapuro"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Idosiye cyangwa Ububiko Ntibibaho"
+#: dialogs/codevieweroptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "Selected:"
+msgstr "Byatoranyijwe:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Kurema Ububiko"
+#: dialogs/codevieweroptionsbase.ui:260
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Igikoresho Funga : </p> "
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "Ntacyo Bimbwiye"
+#: dialogs/codevieweroptionsbase.ui:276
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Funga : </p> "
 
-#: dialogs/codegenerationwizard.cpp:168
-#, fuzzy
-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 ""
-"Ububiko... OYA Byaremwe . \n"
-"Ubwoko Kwandika Kuri Ububiko... Cyangwa Guhitamo , Byemewe , Ububiko... . "
+#: dialogs/codevieweroptionsbase.ui:294
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Ikosa "
+#: dialogs/codevieweroptionsbase.ui:333
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "Guhitamo A Byemewe Ububiko... . "
+#: dialogs/diagrampropertiespage.ui:30
+#, fuzzy, no-c-format
+msgid "Diagram Properties"
+msgstr "Ibiranga Ikadiri"
 
-#: dialogs/codegenerationwizard.cpp:184
-#, fuzzy
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-"Ibisohoka Ububiko... , ni OYA . \n"
-"Gushyiraho i Uruhushya Cyangwa Hitamo... Ububiko... . "
+#: dialogs/diagrampropertiespage.ui:92
+#, fuzzy, no-c-format
+msgid "Zoom:"
+msgstr "Ihindurangano..."
 
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Ikosa Kuri "
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 OYA Kuri A Ububiko... . Hitamo... A Byemewe Ububiko... . "
+#: dialogs/diagrampropertiespage.ui:186
+#, fuzzy, no-c-format
+msgid "Show &grid"
+msgstr "Urusobetudirishya "
 
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "Usabwe guhitamo akamenyetso."
+#: dialogs/diagrampropertiespage.ui:194
+#, fuzzy, no-c-format
+msgid "Snap &to grid"
+msgstr "Gukata ku Rusobe- tudirishya"
 
-#: dialogs/overwritedialogue.cpp:27
-#, fuzzy
-msgid "Destination File Already Exists"
-msgstr "Idosiye "
+#: dialogs/diagrampropertiespage.ui:202
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "Ingano: "
 
-#: dialogs/overwritedialogue.cpp:31
-#, fuzzy
+#: dialogs/diagrampropertiespage.ui:205
+#, fuzzy, no-c-format
 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."
+"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 ""
-"Idosiye %1 in %2 . \n"
-"\n"
-"Guhindura i Idosiye , A Izina: Cyangwa OYA iyi Idosiye . "
-
-#: dialogs/overwritedialogue.cpp:34
-#, fuzzy
-msgid "&Apply to all remaining files"
-msgstr "Kuri Byose Idosiye "
+"i Ingano: Bya i Kuri A Igikubo Bya i Urusobetudirishya Itandukanya: . \n"
+"' Kuri ni Bikora A Buri gihe Na: i Urusobetudirishya ku Byose 4 . "
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Gusimbuza"
+#: dialogs/diagrampropertiespage.ui:257
+#, fuzzy, no-c-format
+msgid "Grid spacing:  "
+msgstr "Itandukanya: : "
 
-#: dialogs/overwritedialogue.cpp:39
-#, fuzzy
-msgid "&Generate Similar File Name"
-msgstr "Idosiye "
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/overwritedialogue.cpp:40
-#, fuzzy
-msgid "&Do Not Generate File"
-msgstr "Idosiye "
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-#, fuzzy
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "< p Itunganya = \" Hagati \" > . </p> "
+#: dialogs/diagrampropertiespage.ui:346
+#, fuzzy, no-c-format
+msgid "Line width:  "
+msgstr "Ubugari bw'Umurongo"
 
-#: associationwidget.cpp:2328
-#, fuzzy
-msgid "Multiplicity"
-msgstr "kuba"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Nka ... "
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: associationwidget.cpp:2346
-#, fuzzy
-msgid "Association Name"
-msgstr "Ishyirahamwe"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-#, fuzzy
-msgid "Enter association name:"
-msgstr "Ishyirahamwe Izina: : "
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr ""
 
-#: associationwidget.cpp:2366
-#, fuzzy
-msgid "Role Name"
-msgstr "Izina ry'idosiye"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Ubwoko: : "
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-#, fuzzy
-msgid "Enter role name:"
-msgstr "Inshingano Izina: : "
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "Ububiko"
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "Igikorwa Izina: : "
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Enter new text:"
-msgstr "Gishya Umwandiko : "
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
+msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "IKOSA"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, fuzzy, no-c-format
+msgid "Role Changeability"
+msgstr "Guhindura Ubwijime"
 
-#: floatingtextwidget.cpp:264
-#, fuzzy
-msgid "Change Text"
-msgstr "Guhindura itagi"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, fuzzy, no-c-format
+msgid "Role Visibility"
+msgstr "igaragara"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Kuringaniza Ibumoso"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Kuringaniza Iburyo"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Kuringaniza Ahabanza"
+#: umbrelloui.rc:13
+#, fuzzy, no-c-format
+msgid "&Diagram"
+msgstr "Biberamye"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Kuringaniza Impera"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "Inshya"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Gutondeka hagati impagarike"
+#: umbrelloui.rc:31
+#, fuzzy, no-c-format
+msgid "Sh&ow"
+msgstr "Garagaza"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Kuringaniza Hagati mu Butambike"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Ihindurangano..."
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Gutondeka hagati impagarike"
+#: umbrelloui.rc:43
+#, fuzzy, no-c-format
+msgid "&Code"
+msgstr "Inyandikoporogaramu"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Kuringaniza Hagati mu Butambike"
+#: umbrelloui.rc:47
+#, fuzzy, no-c-format
+msgid "Active &Language"
+msgstr "&Ururimi"
 
-#: aligntoolbar.cpp:383
+#: tips:3
 #, fuzzy
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Itunganya Kuri Guhitamo Ku 2 Ibintu nka Inzego Cyangwa . OYA Itunganya . "
+"<p> Kuri . </p> \n"
+"<p> Ihangagishusho na Inyandiko Igikoresho . <a href=\"help:/umbrello\"> </"
+"a> ni A Intangiriro Kuri ikoresha . </p> \n"
 
-#: object_factory.cpp:164
+#: tips:11
 #, fuzzy
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "ni A Ijambo-banze ya:  i Ururimi: Bya i Inyandikoporogaramu . "
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr "<p>5."
 
-#: object_factory.cpp:165
+#: tips:17
 #, fuzzy
-msgid "Reserved Keyword"
-msgstr "Imvugo idakorwaho"
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you "
+"need External Folders then deselect &quot;Use tabbed diagrams&quot; in the "
+"General Settings.</p>\n"
+msgstr "<p> na . Hanyuma Kudatoranya &quot; ; in i . </p> \n"
 
-#: umlviewimageexporter.cpp:46
+#: tips:23
 #, fuzzy
-msgid "Exporting view..."
-msgstr "Tegereza..."
-
-#: umlviewimageexporter.cpp:50
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Most diagram items can not be resized, they will resize themselves to fit "
+"to their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and "
+"drag on the red square.</p>\n"
 msgstr ""
+"<p> Ibigize OYA , Ihindurangero %O Kuri Kuri Ibigize . \n"
+", Ibisobanuro na Ubutumwa , Kanda na Kurura ku i Umutuku kare . </p> \n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:30
 #, fuzzy
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr "Wifuzakurisimbura."
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Idosiye isanzwe ihari"
-
-#: model_utils.cpp:244
-#, fuzzy
-msgid "new_actor"
-msgstr "Umubarwa"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 msgstr ""
+"<p> Kuri &Ongera Urwego: Kuri A Kurura Icyinjijwe Kuva: i &Igiti Reba . </"
+"p> \n"
 
-#: model_utils.cpp:248
-#, fuzzy
-msgid "new_package"
-msgstr "Porogaramu"
-
-#: model_utils.cpp:250
-#, fuzzy
-msgid "new_component"
-msgstr "Ibikubiyemo bishya"
-
-#: model_utils.cpp:252
+#: tips:36
 #, fuzzy
-msgid "new_node"
-msgstr "Bidasobetse"
-
-#: model_utils.cpp:254
-#, fuzzy
-msgid "new_artifact"
-msgstr "Ibyatanzwe_X bishya"
-
-#: model_utils.cpp:256
-#, fuzzy
-msgid "new_interface"
-msgstr "Imigaragarire"
-
-#: model_utils.cpp:258
-#, fuzzy
-msgid "new_datatype"
-msgstr "Ibyatanzwe_X bishya"
-
-#: model_utils.cpp:260
-#, fuzzy
-msgid "new_enum"
-msgstr "Ibikubiyemo Bishya"
-
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "Ikiranga"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "Bidasobetse"
-
-#: model_utils.cpp:268
-#, fuzzy
-msgid "new_object"
-msgstr "Kwinjizamo ikintu"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "kirimo ubusa"
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr ""
+"<p> Umukozi Himura Ibikorwa: hagati A Urwego: na na SHINGIRO \n"
+"Inzego . \n"
+"Kanda A Urwego: Kuri Gufungura i Umukozi . </p> \n"
 
-#: model_utils.cpp:559
+#: tips:44
 #, fuzzy
-msgid "Malformed argument"
-msgstr "Inkoresha siyo"
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as "
+"actors.  Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr "<p> Ibintu A Agasanduku na Nka . Kanda Rimwe . </p> \n"
 
-#: model_utils.cpp:560
+#: tips:51
 #, fuzzy
-msgid "Unknown argument type"
-msgstr "Ubwoko: "
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object "
+"box (rather than the vertical line) to make it a constructor.</p>\n"
+msgstr ""
+"<p> Ubutumwa Nka . ku i Igikoresho Agasanduku ( i Uhagaritse: Umurongo: ) "
+"Kuri Ubwoko A . "
 
-#: model_utils.cpp:560
+#: tips:57
 #, fuzzy
-msgid "Illegal method name"
-msgstr "Uburyo Izina: "
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p> Gushigikira Ubutumwa Kuri . ku i Uhagaritse: Umurongo: Nanone Kuri "
+"Kurema . </p> \n"
 
-#: model_utils.cpp:561
+#: tips:63
 #, fuzzy
-msgid "Unknown return type"
-msgstr "Garuka Ubwoko: "
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then "
+"properly populated.\n"
+"</p>\n"
+msgstr ""
+"<p> ku Ifungura A Mvamahanga Idosiye Nta na kimwe ni in i Urutonde Reba , "
+"Kugerageza Mu kubika i Urugero A Izina: , \n"
+", na i Idosiye . i Urutonde Reba ni Hanyuma . \n"
+"</p> \n"
 
-#: model_utils.cpp:561
+#: tips:71
 #, fuzzy
-msgid "Unspecified error"
-msgstr "Ikosa "
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr ""
+"<p> na Kwohereza hanze... i Ishusho Kuri A Ububikokoporora Ikindi "
+"Porogaramu . </p> \n"
 
-#: refactoring/refactoringassistant.cpp:289
+#: tips:78
 #, fuzzy
-msgid "Add Base Class"
-msgstr "Base "
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+"<p> OYA Kuri in Imirongo , MAHARAKUBIRI ku Rimwe Kurema A Akadomo . </p> \n"
 
-#: refactoring/refactoringassistant.cpp:290
+#: tips:84
 #, fuzzy
-msgid "Add Derived Class"
-msgstr "Kongeraho Mucapyi/Urwego..."
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p> ku in i Ikiganiro . </p> \n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
+#: tips:90
 #, fuzzy
-msgid "Add Operation"
-msgstr "Ongera amahitamo"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Kongeraho Ikiranga"
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
+msgstr "<p>php."
 
-#: refactoring/refactoringassistant.cpp:297
+#: tips:101
 #, fuzzy
-msgid "Add Base Interface"
-msgstr "Base "
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr "<p> Gusiba Byose Byahiswemo Ibintu ku Cyangwa . </p> \n"
 
-#: refactoring/refactoringassistant.cpp:298
+#: tips:107
 #, fuzzy
-msgid "Add Derived Interface"
-msgstr "Ahagenewe Ukoresha"
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr ""
+"<p> Byabonetse A in , RW . \n"
+"Tanga Na: i in i Ibikubiyemo . </p> \n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
+#: tips:114
 #, fuzzy
-msgid "Base Classifiers"
-msgstr "Base "
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr ""
+"<p> i Urufunguzo i KIGEZWEHO Kuri i Guhitamo . \n"
+"Kuri i Byakoreshejwe . </p> \n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
+#: tips:121
 #, fuzzy
-msgid "Derived Classifiers"
-msgstr "Ubakoresha Batemerewe"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Isubiranyuma: Kurema Ububiko"
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p> Guhitamo Byose Ibintu ku - A . </p> \n"
 
-#: umlviewimageexportermodel.cpp:145
+#: tips:127
 #, fuzzy
-msgid "Can not save an empty diagram"
-msgstr "OYA Kubika ubusa "
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
 msgstr ""
+"<p> Kurema na Imikorere A Gishya Urwego: ikoresha i in i Ibikubiyemo . </"
+"p> \n"
 
 #, fuzzy
 #~ msgid "Enables/disables the toolbar"
@@ -4482,7 +4581,8 @@ msgstr ""
 #~ "Please select one of the installed languages to generate the code with."
 #~ msgstr ""
 #~ "ni Oya Gikora Ururimi: . \n"
-#~ "Guhitamo Rimwe Bya i yakorewe iyinjizaporogaramu Indimi Kuri i Inyandikoporogaramu Na: . "
+#~ "Guhitamo Rimwe Bya i yakorewe iyinjizaporogaramu Indimi Kuri i "
+#~ "Inyandikoporogaramu Na: . "
 
 #, fuzzy
 #~ msgid "No Language Selected"
@@ -4502,7 +4602,8 @@ msgstr ""
 #~ "Please select one of the installed languages to generate the code with."
 #~ msgstr ""
 #~ "OYA Gushaka Gikora Ururimi: . \n"
-#~ "Guhitamo Rimwe Bya i yakorewe iyinjizaporogaramu Indimi Kuri i Inyandikoporogaramu Na: . "
+#~ "Guhitamo Rimwe Bya i yakorewe iyinjizaporogaramu Indimi Kuri i "
+#~ "Inyandikoporogaramu Na: . "
 
 #, fuzzy
 #~ msgid "UMLRolePropertiesBase"
diff --git a/tde-i18n-sk/messages/tdesdk/umbrello.po b/tde-i18n-sk/messages/tdesdk/umbrello.po
index 91503b0d4a6..b07ee7cbc0a 100644
--- a/tde-i18n-sk/messages/tdesdk/umbrello.po
+++ b/tde-i18n-sk/messages/tdesdk/umbrello.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-09-29 19:27+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,245 +16,203 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Autonomný generátor kódu Umbrello UML Modeller"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Súbor určený na transformáciu"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Súbor XSLT ktorý bude použitý"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (tiež Kleag), (c) 2002-2006 Autori programu Umbrello "
-"UML Modeller"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autori programu Umbrello UML Modeller"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Zoltán Bartko Marek Schimara"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Exportujú sa všetky pohľady..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "bartko.zoltan@pobox.sk mojbordel@yahoo.co.uk"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Nastali chyby pri exportovaní obrázku:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Zadajte názov aktivity"
 
-#: 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 "Počas ukladania súboru %1 došlo k chybe"
+#: 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 "Zadajte názov novej aktivity:"
 
-#: 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 "Chyba pri ukladaní"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Zarovnať doľava"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Zarovnať doprava"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synchrónna správa"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Zarovnať hore"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynchrónna správa"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Zarovnať nadol"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Asociácia"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Zarovnať zvisle do stredu"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Obsahuje"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Zarovnať vodorovne do stredu"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ukotvenie"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Zarovnať zvisle na okraje"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Popisok"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Zarovnať vodorovne na okraje"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Poznámka"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Je nutné vybrať najmenej 2 objekty (triedy, aktéri,...) na zarovnanie. "
+"Asociácie nie je možné zarovnávať."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Obdĺžnik"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formátovanie"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktér"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Závislosť"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Zovšeobecnenie"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregácia"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Vzťah"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Asociácia so smerovaním"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementácia (zovšeobecnenie/realizácia)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompozícia"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Prípad použitia"
-
-#. 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 "Trieda"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Počiatočný stav"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Konečný stav"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Rozvetvenie/spojenie vetiev"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Rozdeliť/spojiť"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Balík"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponent"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Uzol"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Závislosť"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Asociácia"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Rozhranie"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Autoasociácia"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Údajový typ"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Správa o spolupráci"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enumeračný typ"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Správa o sekvencii"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Objekt"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Správa o spolupráci samému sebe"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Hlboká história"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sequence Self Message"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Plytká história"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Obsahuje"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Spojiť"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompozícia"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Vetviť"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizácia"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Križovatka"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Jednosmerná asociácia"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Výber"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ukotvenie"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Prechod medzi stavmi"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Prechod medzi aktivitami"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktivita"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stav"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Násobnosť"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Konečná aktivita"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Zadajte násobnosť:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Počiatočná aktivita"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Názov asociácie"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Správa"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Zadajte názov asociácie:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "UNDEFINED"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Názov role"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Vybrať"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Zadajte názov role:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr "Už exisuje operácia s touto signatúrou. Nie je možné znovu ju pridať."
+
+#: 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 "Tento názov je neplatný."
+
+#: 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 "Neplatný názov"
+
+#: 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 "Tento názov sa už používa."
+
+#: 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 "Názov nie je jedinečný"
 
 #: 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."
+"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 ""
 "Aspoň 1 objekt nebolo možné vložiť zo schránky, pretože už existuje objekt s "
 "rovnakým názvom. Všetky ostatné objekty boli vložené."
@@ -276,10 +234,8 @@ msgid "Cannot Open File"
 msgstr "Nebolo možné otvoriť súbor"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Nie je možné vytvoriť adresár balíka:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Nie je možné vytvoriť adresár balíka:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -293,1343 +249,1518 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Nie je možné vytvoriť adresár"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Zadajte názov stavu"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Všeobecné nastavenia"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Zadajte názov nového stavu:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Balík je menný priestor"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Zadajte aktivitu"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuálne deštruktory"
 
-#: 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 "Zadajte názov novej aktivity:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generovať prázdne konštruktory"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nová aktivita"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generovať metódy pre prístup k atribútom"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML model"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operácie sú typu inline"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logický pohľad"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Prístupové metódy k atribútom sú typu inline"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Pohľad prípadov použitia"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Prístupové metódy k atribútom sú verejné"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Pohľad komponentov"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Import súboru: %1 Stav: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Pohľad zavedenia"
+#: 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 "Hotovo."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model vzťahov objektov"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Je rozsah platnosti %1 menný priestor alebo trieda?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Údajové typy"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ import požaduje vašu pozornosť"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Aktuálny súbor bol zmenený.\n"
-"Chcete ho uložiť?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Menný priestor"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Súbor %1 neexistuje."
+#: 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 "Trieda"
 
-#: 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 "Chyba pri načítavaní"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Interná chyba"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Súbor %1 vyzerá byť poškodený."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Chyba syntaxe pred '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Žiaden XMI súbor nebol nájdený v komprimovanom súbore %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Chyba syntaktickej analýzy pred '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Pri načítavaní súboru %1 došlo k chybe"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Pri načítavaní súboru %1 došlo k chybe"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "očakávaný výraz"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Pri nahrávaní súboru %1 na server došlo k chybe"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Syntaktická chyba v deklarácii"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "Diagram prípadov použitia"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "Očakávaná }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Diagram tried"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "bol očakávaný menný priestor"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sekvenčný diagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "Očakávaná {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagram spolupráce"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Bol očakávaný názov menného priestoru"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "stavový diagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Je potrebné zadať špecifikáciu typu"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagram aktivity"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "Bola očakávaná deklarácia"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagram komponentov"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Bol očakávaný konštantný výraz"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagram zavedenia"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "Bola očakávaná ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagram vzťahov medzi objektami"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "chýbajúca }"
 
-#: 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 "Názov"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Bola očakávaná inicialiácia člena"
 
-#: 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 "Zadajte názov:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Boli očakávané základné klasifikátory triedy"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Tento názov nie je platný pre diagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Bol očakávaný výraz inicializátora"
 
-#: 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 "Neplatný názov"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Bol očakávaný identifikátor"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Už existuje diagram s týmto názvom."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Bol očakávaný ID typu"
 
-#: 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 "Názov nie je jedinečný"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Bolo očakávané meno triedy"
 
-#: 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 "Tento názov je neplatný."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "Bola očakávaná podmienka"
 
-#: 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 "Tento názov sa už používa."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "Bol očakávaný príkaz"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Zadaný názov nie je jednoznačný\n"
-"Ste si istý?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "Bola očakávaná inicializácia for"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Názov nie je jedinečný"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "Bol očakávaný catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Použiť meno"
+#: 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 "&Vlastnosti..."
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Zadajte nové meno"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Počiatočná aktivita"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Naozaj chcete vymazať diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Konečná aktivita"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Vymazať diagram"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Rozvetvenie/spojenie vetiev"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Pripravujem dokument..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Rozdeliť/spojiť"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Analyzujem referencie objektu..."
+#: 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 "Všeobecne"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Načítavam prvky UML..."
+#: 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 "Všeobecné vlastnosti"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Načítavam diagramy..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Typ aktivity:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Názov aktivity:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/autosave%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 "Dokumentácia"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Spraviť priečinok externým"
+#: 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 "Písmo:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Zadajte názov modelu"
+#: 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 "Nastavenie písma"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Zadajte nový názov modelu:"
+#: 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 "Farba"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Pohľady"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Farby prvkov komponentu"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Vami zadaný názov je neplatný.\n"
-"Proces vytvárania bol zastavený."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivity"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Názov nie je platný"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nová aktivita..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Zadaný názov nie je jedinečný!\n"
-"Vytváranie bolo zastavené."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Zrušiť ukotvenie"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Vytváranie zastavené"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Premenovať"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Načítavam listview..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nová aktivita"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Priečinok treba vyprázdniť pred vymazaním."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nová aktivita"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Priečinok nie je prázdny"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Premenovať aktivitu"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "Už exisuje operácia s touto signatúrou. Nie je možné znovu ju pridať."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Zadajte nový názov aktivity:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Zadajte názov aktivity"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Názov:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nový stav"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Typ:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Zovšeobecnenie"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Asociácie"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Autoasociácia"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Vlastnosti asociácie"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Správa o spolupráci"
+#: 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 "Všeobecné nastavenia"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Správa o sekvencii"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Role"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Správa o spolupráci samému sebe"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Nastavenie role"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sequence Self Message"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Písmo asociácie"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizácia"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Vlastnosti role A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Jednosmerná asociácia"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Vlastnosti role B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportovať"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Viditeľnosť role A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "Dia&gram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Vlastnosti role B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nový"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Zameniteľnosť role A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Zobraziť"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Zameniteľnosť role B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kód"
+msgid "Rolename:"
+msgstr "Názov role:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktívny &jazyk"
+msgid "Multiplicity:"
+msgstr "Násobnosť:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentácia"
+msgid "Public"
+msgstr "Verejný"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Lomka-lomka (//)"
+msgid "Private"
+msgstr "Súkromný"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Lomka-hviezda (/**  */)"
+msgid "Protected"
+msgstr "Chránený"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Štýl:"
+msgid "Implementation"
+msgstr "Implementácia"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Generovanie kódu C++</p>"
+msgid "Changeable"
+msgstr "Zameniteľný"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Všeobecne"
+msgid "Frozen"
+msgstr "Zmrazený"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Generovanie tela metód"
+msgid "Add only"
+msgstr "Iba pridávať"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Pre triedy v generovanom kóde použiť:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Názov &triedy"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Názov &aktéra"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Názov &balíka"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Premenný</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Názov &prípadu použitia"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Názov &rozhrania"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Názov &komponentu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Názov a&rtefaktu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Názov &enumeračného typu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Zoznam</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Názov ú&dajového typu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Názov objektu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Názov &stereotypu:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Názov &balíka:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Názov triedy"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "&Abstraktná trieda"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Vložiť súbor</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstraktný prípad použitia"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generovať projekt"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Vykonateľný"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Generovať dokument zostavenia ANT"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Zobraziť ako"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Automaticky generovať metódy"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Š&tandardný"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Prázdne konštruktory"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "Farba &výplne:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Metódy pre prístup k asociáciám"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Knižnicu"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Metódy pre prístup k atribútom"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabuľku"
 
-#. 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 "Verejný"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Viditeľnosť"
 
-#. 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 "Súkromný"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Verejný"
 
-#. 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 "Chránený"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "Súk&romný"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Od rodičovského objektu"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Chrá&nený"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Štandardná viditeľnosť prístupu k atribútu:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Imple&mentácia"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Štandardná viditeľnosť asociačného poľa:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Názov triedy:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Od rodičovskéj roly"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Názov inštancie:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generovanie kódu Java</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Zobraziť ako aktéra"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Maltézsky kríž (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Viacnásobná inštancia"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Begin-End (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Zobraziť dekonštrukciu"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generovanie kódu Ruby</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Názov komponentu:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Názov uzla:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Názov stereotypu:"
+
+#: 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 ""
+"Vami zadaný názov sa už používa.\n"
+"Bol obnovený pôvodný názov."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Názov nie je jedinečný"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atribúty"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Nový &atribút"
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operácie"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Nová &operácia"
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Šablóny"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Nová ša&blóna..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Literály enumeračného typu"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Nový &literál enumeračného typu..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atribúty objektu"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Nový &atribút objektu"
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Zrušiť ukotvenie"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Vlastnosti..."
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Zobraziť"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Operácie"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Viditeľnosť"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Si&gnatúra operácie"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Balík"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&Atribúty"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Stereotyp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Signa&túra atribútu"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Zobraziť ako kružnicu"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Zobrazenie"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Možnosti zobrazenia"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Nastavenia atribútov"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Nastavenia operácií"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Nastavenia šablón"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Nastavenia literálov enumeračného typu"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Nastavenia atribútov objektu"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Obsahuje"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Nastavenie obsahu"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Asociácie tried"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nová_trieda"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nová trieda"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atribúty triedy"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "operácie triedy"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Nastavenia generovania zdrojového kódu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Jazyk"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generovať"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Priečinky"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Hotovo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Zapísať všetky generované súbory do priečinku:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Zdrojový kód je vygenerovaný"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Pr&echádzať"
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Generovanie nevykonané"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Pr&echádzať"
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ešte nevygenerované"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Vložiť hlavičkové súbory z adresára:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Priečinok %1 neexistuje. Chcete ho vytvoriť?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Súbory vygenerované generátorom zdrojového kódu budú zapísané do tohto "
-"priečinku."
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Priečinok na zápis neexistuje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Vytvoriť adresár"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Nevytvárať"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Súbory v tomto priečinku budú použité ako hlavičkové súbory v generovanom "
-"zdrojovom kóde. "
+"Chyba pri vytváraní priečinka.\n"
+"Prosím skontrolujte vaše práva pre nadradený priečinok alebo vyberte iný "
+"priečinok."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Pravidlá pre prepísanie"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Chyba pri vytvární priečinku"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Vyberte platný priečinok prosím."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Ak existuje súbor s názvom totožným s tým, ktorý chce použiť generátor "
-"zdrojového kódu pre výstup:"
+"Priečinok na ukladanie existuje ale nie je možné doň zapisovať.\n"
+"Prosím nastavte práva na zápis alebo vyberte iný priečinok."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Prepísať"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Nastala chyba pri zápise do priečinka."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Prepísať súbory, ktoré už existujú v cieľovom priečinku"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 zrejme nie je priečinok. Prosím vyberte právoplatný priečinok."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "O&pýtať sa"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Prosím vyberte právoplatný priečinok."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Ak existuje súbor s rovnakým názvom, opýtať sa, aký bude ďalší krok."
+msgid "Code Viewer"
+msgstr "Okno zobrazenia kódu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "Použiť &iný názov súboru."
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nie sú dostupné žiadne voľby.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Ak už existuje súbor s rovnakým názvom v cieľovom adresári, vybrať iný názov "
-"pridaním prípony k názvu súboru. "
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formátovanie"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Čiary"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Aktuálny diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Štýl zakončenia čiar:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Všetky diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Typ zarážok:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "Vy&brať diagramy"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Miera zarovnania:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Typ diagramu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Výber"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Prípad použitia"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Spolupráca"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvencia"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stav"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponent"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Zavedenie"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Nevybrali ste žiadne diagramy."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Formát pre export obrázkov"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Dokumentácia poznámok"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Cieľový súbor už existuje"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Súbor %1 už existuje v adresári %2.\n"
+"\n"
+"Umbrello súbor prepísať, vybrať podobný názov alebo\n"
+"nevygenerovať súbor."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Aplikovať pre ostatné súbory"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Bez zarovnania"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Prepísať"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulátor"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Generovať podobný názov súboru"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Medzera"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Negenerovať súbor"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Výrečnosť komentárov"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Vlastnosti parametra"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "Zapísať komentáre pre sekcie aj keď sú prázdne."
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Typ:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Názov:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "Počiatočná &hodnota:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Smer podávania"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Zapísať komentáre pre jednotlivé sekcie (public, private, atď.) v triede, aj "
-"keď sú tieto komentáre prázdne."
+"\"in\" je parameter len pre čítanie, \"out\" je parameter iba pre zápis a "
+"\"inout\" je parameter pre čítanie aj zápis."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Zapísať dokumentačné komentáre aj keď nie sú zadané."
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Obsiahnuté prvky"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Zapísať komentáre pre dokumentáciu &tried a metód aj keď je dokumentácia "
-"prázdna."
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Vybrať operáciu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Nastavenia jazykov"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Poradové číslo:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Asistent generovania zdrojového kódu"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operácia triedy:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Vybrať triedy"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Užívateľom definovaná operácia:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Nastavenia Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Užívateľské rozhranie"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Nastavenia užívateľského rozhrania"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Farba čiary:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Š&tandardná farba"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Farba výplne:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Š&tandardná farba"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Šírka čiary:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Š&tandardná šírka"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "P&oužiť farbu výplne"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Umiestnite všetky triedy, pre ktoré chcete generovať zdrojový kód do zoznamu na "
-"pravej strane."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Pridajte triedu pre generovanie zdrojového kódu"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Povoliť návrat späť (undo)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Vybrané triedy"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Použiť diagramy so záložkami"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Vynechať triedu z generovania zdrojového kódu"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Použiť nové generátory pre C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Dostupné triedy"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Použiť lomené asociačné čiary"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Stav generovania zdrojového kódu"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatické ukladanie"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Stlačte tlačidlo generácie pre spustenie generovania kódu."
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "A&ktivovať automatické ukladanie"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Stav generovania"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Interval pre automatické ukladanie (v minútach):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Okno zobrazenia kódu"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Nastaviť príponu pre automatické ukladanie:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Zobraziť skryté bloky"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Súbor pre automatické ukladanie bude zapísaný do ~/autosave.xmi v "
+"prípade že automatické ukladanie nastane pred ručným uložením súboru.</"
+"p><p>Ak súbor už bol uložený, autimatické ukladanie použije ten istý "
+"priečinok a pridá k menu súboru príponu pre automatické ukladanie.</p><p>V "
+"prípade keď sa prípona uloženého súboru zhoduje s príponou pre automatické "
+"ukladanie, starší súbor bude automaticky prepísaný novou verziou počas "
+"automatického ukladania.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">sem patrí názov komponentu</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Spustenie"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Zobraziť typ bloku"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Logo pri spustení"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Farby"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Tip dňa"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Písmo:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Načítať posledný projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papier:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Začať nový projekt s týmto diagramom:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Vybrané:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "bez diagramov"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">blok UML objektu:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Diagram tried"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skrytý blok</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Diagram prípadov použitia"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Neprepísateľný text:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sekvenčný diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Prepísateľný text:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagram spolupráce"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Vlastnosti diagramu"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Stavový diagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Názov:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagram aktivity"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zväčšenie:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagram komponentov"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagram zavedenia"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Nastavenia triedy"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Zobraziť &viditeľnosť"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Zobraziť &atribúty"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Zobraziť &operácie"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Zobraziť &stereotyp"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Zobraziť signatúru atribútu"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Zobraziť balík"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Zobraziť signatúru operácie"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Zobraziť &mriežku"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Počiatočná viditeľnosť"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Pri&pojiť k mriežke"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Štandardná viditeľnosť atribútu:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Pripojiť veľkosť komponentov"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Štandardná viditeľnosť operácie:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generovanie zdrojového kódu"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Nastavenie generovania zdrojového kódu"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Nastavenie zobrazenia zdrojového kódu"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Počiatočný stav"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Konečný stav"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Typ stavu:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Názov stavu:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Farba prvku komponentu"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Vlastnosti atribútu"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Oblasť &klasifikácie (\"statická\")"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Verejný"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Chrán&ený"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementácia"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Zadali ste neplatný názov atribútu."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Názov atribútu je neplatný"
+
+#: dialogs/umlattributedialog.cpp:163
 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 ""
-"Fixovať veľkosť komponentov, aby bola násobkom jednotky mriežky.\n"
-"Ak je \"pripevniť k mriežke\" povolené, komponent bude vždy v súlade s mriežkou "
-"na všetkých šytroch stranách."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Názov parametra, ktorý ste zvolili sa už v tejto operácii používa."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Jednotka mriežky:  "
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Názov atribútu nie je jedinečný"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Vlastnosti atribútu objektu"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Štandardná ho&dnota:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Šírka čiary:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Dĺžka/hodnoty:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exportovať všetky pohľady.."
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automaticky zvyšovať"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "Priečinok na ukla&danie diagramov:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Povoliť &null"
 
-#. 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"
-msgstr "Základný priečinok na ukladanie obrázkov"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atribúty:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Typ &obrazu:"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexácia"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Formát pre export obrázkov"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "Žiad&ny"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Použiť p&riečinky"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primárny"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Jedinečný"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Zadali ste neplatný názov atribútu objektu."
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Názov atribútu objektu je neplatný"
+
+#: 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 ""
-"Vytvoriť stromovú štruktúru v cieľovom priečinku\n"
-"ktorá zodpovedá štruktúre pohľadov dokumentu"
+"Názov atribútu objektu ktorý ste zvolili sa už v tejto operácii používa."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Názov atribútu objektu nie je jedinečný"
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Vlastnosti operácie"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Abstraktná operácia"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Otázka (\"const\")"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametre"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Nový &parameter..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Zadali ste neplatný názov parametra."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Názov parametra nie je platný"
+
+#: 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 ""
-"Pohľady sú uložené v priečinkoch dokumentu. Taká istá stromová štruktúra môže "
-"byť vytvorená vo vybranom základnom priečinku použitím tohto nastavenia.\n"
-"V základnom priečinku sa nachádzajú iba priečinky vytvorené užívateľom (Logický "
-"pohľad, Pohľad prípadov použitia atď nie sú v tomto priečinku vytvorené)."
+"Názov parametra, ktorý ste zvolili\n"
+"sa už v tejto operácii používa."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Názov parametra nie je jednoznačný"
+
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Názov parametra, ktorý ste zvolili sa už v tejto operácii používa."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Zadali ste neplatný názov operácie."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Názov operácie nie je platný"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Už exisuje operácia s touto signatúrou: %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Vyberte iný zoznam názvov alebo parametrov"
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "Vlastnosti role"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Názov role:"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Vlastnosti šablóny"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Násobnosť:"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Zadali ste neplatný názov šablóny."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Zamenitešnosť role"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Názov šablóny nie je platný"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Iba pridávať"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Názov parametra ktorý ste zvolili sa už v tejto operácii používa."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zmrazený"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Názov parametra nie je jednoznačný"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Zameniteľný"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Nastavenia zobrazenia tried"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Viditeľnosť role"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Farby diagramov"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementácia"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Vami zadaný názov je neplatný."
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Vitajte v Umbrello.</p>\n"
-"<p>UML diagramy umožňujú vývoj a dokumentáciu objektovo orientovaního softvéru. "
-" <a href=\"help:/umbrello\">Umbrello Handbook</a> je dobrý úvod do UML.</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Vami zadaný názov nie je jedinečný."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Vitajte v Umbrello 1.5. Novinky v tejto verzii sú: asociačné triedy, "
-"generátor kódu Ruby, externé priečinky, možnosť zmeniť rozhrania (interfaces) "
-"na triedy, atď.</p>\n"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Názov nie je jedinečný"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Diagramy so záložkami a externé priečinky sa navzájom vylučujú. Ak "
-"potrebujete externé priečinky musíte odznačiť &quot;Použiť diagramy so "
-"záložkami&quot; vo Všeobecných nastaveniach.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "Či&ara:"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"f"
-"<p>U väčšiny prvkov diagramov nie je možné zmeniť ich veľkosť, zmenia svoju "
-"veľkosť sami podľa svojho obsahu. Veľkosť obdĺžnikov, poznámok a správ v "
-"sekvenčných diagramoch je možné zmeniť - stačí kliknúť a potiahnuť červený "
-"štvorec.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "Farba &výplne:"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Ak chcete pridať existujúcu triedu, stačí pretiahnuť záznam zo stromového "
-"pohľadu.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Š&tandardná farba"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Nástroj pre refactoring umožňuje presun operácií medzi triedou a jej "
-"odvodenými a základnými triedami. Kliknite na triedu pravým tlačidlom myši pre "
-"otvorenie nástroja pre refactoring.</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "P&oužiť farbu výplne"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p> Objekty v sekvenčných diagramoch môžu mať značku deštrukcie a môžu tiež byť "
-"zobrazené ako aktéri. Ak dvakrát kliknete na takýto objekt, zobrazí sa dialóg "
-"Vlastnosti.</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Exportujú sa všetky pohľady..."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Správy sekvenčných diagramov môžu byť použité ako konštruktory.  Kliknite na "
-"objekt (namiesto na zvislú čiaru) ak chcete vytvoriť konštruktor.</p>\n"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Nastali chyby pri exportovaní obrázku:"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sekvenčné diagramy podporujú posielanie správ samým sebe.  Kliknite opäť na "
-"tú istú zvislú čiaru ak chcete vytvoriť takúto správu.</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 "Počas ukladania súboru %1 došlo k chybe"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Ak je listview prázdny po načítaní súboru, skúste uložiť model pod iným "
-"menom, zatvorte súbor a otvorte duplikát. Obsah listview by mal byť správne "
-"vygenerovaný.</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 "Chyba pri ukladaní"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Príkazy Vystrihnúť a Kopírovať vložia do schránky aj obrázok vo formáte PNG, "
-"ktorý môžete vložiť do KWordu alebo do inej aplikácie.</p>\n"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Autonomný generátor kódu Umbrello UML Modeller"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Asociácie nemusia byť iba priame čiary- Kliknite dvakrát na čiaru a "
-"vytvoríte pohyblivý bod.</p>\n"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Súbor určený na transformáciu"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Automatické ukladanie môžete nastaviť v dialógu \"Nastaviť Umbrello\"</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Súbor XSLT ktorý bude použitý"
 
-#: 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 ""
-"<p>Chýba vám nejaká vlastnosť z programu Umbrello? Dajte nám vedieť.\n"
-"Kontaktné adresy sú na našej internetovej stránke:</p>\n"
-"<p><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</p>\n"
+"(c) 2006 Gael de Chalendar (tiež Kleag), (c) 2002-2006 Autori programu "
+"Umbrello UML Modeller"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Vybrané objekty môžete vymazať stlačením klávesu Del alebo Backspace.</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autori programu Umbrello UML Modeller"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Prosím, ak nájdete chybu v programe Umbrello, dajte nám vedieť. Hlásenia o "
-"chybách nám môžete poslať prostredníctvomnástroja \"Poslať správu o chybe\" z "
-"ponuky \"Pomocník\".</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 "Názov"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Stlačením tlačidla Esc sa aktuálny nástroj zmení na nástroj výberu. "
-"Backspace spôsobí skok na predtým použitý nástroj</p>\n"
+#: 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 "Zadajte názov:"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Všetky objekty môžete vybrať stlačením Ctrl+A.</p>\n"
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Zadajte názov operácie:"
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Pomocou Asistenta vytvorenia novej triedy v ponuke \"Kód\" môžete vytvoriť a "
-"nastaviť novú triedu.</p>\n"
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Zadajte nový text:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "CHYBA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Zmeniť text"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Súbor %1 neexistuje."
+
+#: 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 "Chyba pri načítavaní"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Súbor %1 nemožno otvoriť."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1683,6 +1814,10 @@ msgstr "Nová operácia..."
 msgid "Select Operation..."
 msgstr "Vybrať operáciu..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Zmeniť text..."
@@ -1734,6 +1869,19 @@ msgstr "Nový"
 msgid "Rename..."
 msgstr "Premenovať..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Chyba vloženia"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Farba čiary..."
@@ -1762,14 +1910,26 @@ msgstr "Zmeniť priečinok na interný"
 msgid "Import Classes..."
 msgstr "Importovať triedy..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Balík"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Subsystém"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Diagram komponentov..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Uzol"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagram zavedenia..."
@@ -1778,10 +1938,18 @@ msgstr "Diagram zavedenia..."
 msgid "Folder"
 msgstr "Priečinok"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Objekt"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagram vzťahov medzi objektami..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktér"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Diagram prípadov použitia...."
@@ -1818,6 +1986,18 @@ msgstr "Nový atribút objektu..."
 msgid "Export as Picture..."
 msgstr "E&xportovať ako obrázok..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Rozhranie"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Údajový typ"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enumeračný typ"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagram tried..."
@@ -1838,26 +2018,10 @@ msgstr "Sekvenčný diagram..."
 msgid "Collaboration Diagram..."
 msgstr "Diagram spolupráce..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atribúty"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operácie"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Striktne verejné"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Viditeľnosť"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Signatúra operácie"
@@ -1870,11 +2034,6 @@ msgstr "Signatúra atribútu"
 msgid "Stereotype"
 msgstr "Stereotyp"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Zobraziť"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribút..."
@@ -1899,14 +2058,6 @@ msgstr "Farba výplne..."
 msgid "Use Fill Color"
 msgstr "Použiť farbu výplne"
 
-#: 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 "Farba"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktér..."
@@ -1935,10 +2086,26 @@ msgstr "Enumeračný typ..."
 msgid "Package..."
 msgstr "Balík..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Počiatočný stav"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Konečný stav"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stav..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Počiatočná aktivita"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Konečná aktivita"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Subsystém..."
@@ -1983,6 +2150,14 @@ msgstr "Zrušiť ukotvenie"
 msgid "Change Association Name..."
 msgstr "Zmeniť názov asociácie..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Vyprázdniť diagram"
@@ -2017,8 +2192,8 @@ msgstr "priečinok súboru"
 
 #: 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 "uložiť stromovú štruktúru pohľadov dokumentu do cieľového priečinka"
 
 #: main.cpp:95
@@ -2026,191 +2201,94 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2003 Autori programu Umbrello UML Modeller"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Nepovolené použitie asociácií."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Chyba asociácie"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Súbor %1 neexistuje."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Súbor %1 nemožno otvoriť."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Zoltán Bartko Marek Schimara"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "bartko.zoltan@pobox.sk mojbordel@yahoo.co.uk"
-
-#: 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 "Hotovo."
-
-#: 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 ""
-"Podržte klávesu SHIFT alebo CTRL pre pohyb po osi X. Podržte klávesy SHIFT a "
-"CTRL spolu pre pohyb po osi Y. Pre zrušenie pohybu kliknite pravým tlačidlom "
-"myši."
-
-#: 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 ""
-"Podržte klávesu SHIFT alebo CTRL pre pohyb po osi X. Podržte klávesy SHIFT a "
-"CTRL spolu pre pohyb po osi Y. Pre zrušenie zmeny veľkosti kliknite pravým "
-"tlačidlom myši."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Je rozsah platnosti %1 menný priestor alebo trieda?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ import požaduje vašu pozornosť"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Menný priestor"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Import súboru: %1 Stav: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Interná chyba"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Chyba syntaxe pred '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Chyba syntaktickej analýzy pred '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "nový_aktér"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "očakávaný výraz"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nový_prípad_použitia"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Syntaktická chyba v deklarácii"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nový_balík"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "Očakávaná }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nový_komponent"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "bol očakávaný menný priestor"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "nový_uzol"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "Očakávaná {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "nový_artefakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Bol očakávaný názov menného priestoru"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nové_rozhranie"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Je potrebné zadať špecifikáciu typu"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "nový_údajový_typ"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "Bola očakávaná deklarácia"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "nový_enumeračný_typ"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Bol očakávaný konštantný výraz"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nový_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "Bola očakávaná ')'"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nový_priečinok"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "chýbajúca }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nová_asociácia"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Bola očakávaná inicialiácia člena"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nový_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Boli očakávané základné klasifikátory triedy"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Bol očakávaný výraz inicializátora"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Prázdny"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Bol očakávaný identifikátor"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Zle vytvorený argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Bol očakávaný ID typu"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Neznámy typ argumentu"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Bolo očakávané meno triedy"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nepovolené meno metódy"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "Bola očakávaná podmienka"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Neznámy návratový typ"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "Bol očakávaný príkaz"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Neznáma chyba"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "Bola očakávaná inicializácia for"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Toto je kľúčové slovo jazyka nastaveného generátora kódu."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "Bol očakávaný catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Vyhradené kľúčové slovo"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2224,105 +2302,66 @@ msgstr "Zadajte názov objektu:"
 msgid "new_parameter"
 msgstr "nový_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Všeobecné nastavenia"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Balík je menný priestor"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuálne deštruktory"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generovať prázdne konštruktory"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generovať metódy pre prístup k atribútom"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operácie sú typu inline"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Prístupové metódy k atribútom sú typu inline"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Prístupové metódy k atribútom sú verejné"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Strana %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Zadajte názov diagramu"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Pridať základnú triedu"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Zadajte nový názov diagramu:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Pridať odvodenú triedu"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Chystáte sa vymazať celý diagram.\n"
-"Chcete naozaj pokračovať?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Pridať operáciu"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Vymazať diagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Pridať atribút"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Premenovanie zrušené"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Pridať základné rozhranie"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Premenovanie prvku listview typu %1 zatiaľ nie je funkčné."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Pridať odvodené rozhranie"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkcia zatiaľ nie je realizovaná"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Základné klasifikátory"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Vami zadaný názov je neplatný!\n"
-"Proces premenovania bol zastavený."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Odvodené klasifikátory"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nová_asociácia"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Zadajte názov stavu"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nový atribút"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Zadajte názov nového stavu:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nová_šablóna"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Zadajte aktivitu"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nová_operácia"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Nepovolené použitie asociácií."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nový_literál"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Chyba asociácie"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nové_pole"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nový stav"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2476,11 +2515,6 @@ msgstr "&Exportovať ako obrázok..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Exportovať &všetky diagramy ako obrázky..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Vlastnosti..."
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Nastavenie &zväčšenia"
@@ -2565,14 +2599,21 @@ msgstr "&Dokumentácia"
 msgid "Opening file..."
 msgstr "Otváram súbor..."
 
+#: 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 "Vytváram nový dokument..."
 
 #: 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"
@@ -2609,6 +2650,10 @@ msgstr ""
 "*.xmi.tar.bz2|Súbory XMI komprimované pomocou Bzip2\n"
 "*|Všetky súbory"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2617,6 +2662,10 @@ msgstr ""
 "Súbor %1 už existuje.\n"
 "Chcete ho prepísať?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Prepísať"
@@ -2652,8 +2701,8 @@ msgstr "Vkladám obsah schránky..."
 
 #: 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 ""
 "Umbrello nedokázal vložiť obsah schránky. Objekty v schránke sú možno typu "
 "ktorý sem nie je možné vložiť."
@@ -2710,1260 +2759,1312 @@ msgstr "Všetky súbory"
 msgid "Select Code to Import"
 msgstr "Vyberte kód ktorý chcete importovať"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Názov &triedy"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Názov &aktéra"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nový atribút"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Názov &balíka"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nová_šablóna"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Názov &prípadu použitia"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nová_operácia"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Názov &rozhrania"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nový_literál"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Názov &komponentu:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nové_pole"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Názov a&rtefaktu:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML model"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Názov &enumeračného typu:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logický pohľad"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Názov ú&dajového typu:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Pohľad prípadov použitia"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Názov objektu:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Pohľad komponentov"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Názov &stereotypu:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Pohľad zavedenia"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Názov &balíka:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model vzťahov objektov"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "&Abstraktná trieda"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Údajové typy"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstraktný prípad použitia"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Aktuálny súbor bol zmenený.\n"
+"Chcete ho uložiť?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Vykonateľný"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Súbor %1 neexistuje."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Zobraziť ako"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Súbor %1 vyzerá byť poškodený."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Š&tandardný"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Žiaden XMI súbor nebol nájdený v komprimovanom súbore %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Knižnicu"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Pri načítavaní súboru %1 došlo k chybe"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabuľku"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Pri načítavaní súboru %1 došlo k chybe"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Verejný"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Pri nahrávaní súboru %1 na server došlo k chybe"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "Súk&romný"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "Diagram prípadov použitia"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Chrá&nený"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Diagram tried"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Imple&mentácia"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sekvenčný diagram"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Názov triedy:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagram spolupráce"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Názov inštancie:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "stavový diagram"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Zobraziť ako aktéra"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagram aktivity"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Viacnásobná inštancia"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagram komponentov"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Zobraziť dekonštrukciu"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagram zavedenia"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Názov komponentu:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagram vzťahov medzi objektami"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Názov uzla:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Tento názov nie je platný pre diagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Názov stereotypu:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Už existuje diagram s týmto názvom."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Vami zadaný názov sa už používa.\n"
-"Bol obnovený pôvodný názov."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Názov nie je jedinečný"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "Či&ara:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "Farba &výplne:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Š&tandardná farba"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "P&oužiť farbu výplne"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivity"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nová aktivita..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Premenovať"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nová aktivita"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Premenovať aktivitu"
+"Zadaný názov nie je jednoznačný\n"
+"Ste si istý?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Zadajte nový názov aktivity:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Použiť meno"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Vlastnosti asociácie"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Zadajte nové meno"
 
-#: 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 "Všeobecné nastavenia"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Naozaj chcete vymazať diagram %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Role"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Vymazať diagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Nastavenie role"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Pripravujem dokument..."
 
-#: 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 "Nastavenie písma"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Analyzujem referencie objektu..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Písmo asociácie"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Načítavam prvky UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Vlastnosti šablóny"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Načítavam diagramy..."
 
-#: 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 "Všeobecné vlastnosti"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/autosave%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Typ:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Spraviť priečinok externým"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Názov:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Zadajte názov modelu"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Zadali ste neplatný názov šablóny."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Zadajte nový názov modelu:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Názov šablóny nie je platný"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Pohľady"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Názov parametra ktorý ste zvolili sa už v tejto operácii používa."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Názov parametra nie je jednoznačný"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Vami zadaný názov je neplatný.\n"
+"Proces vytvárania bol zastavený."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Vlastnosti atribútu objektu"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Názov nie je platný"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Štandardná ho&dnota:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Zadaný názov nie je jedinečný!\n"
+"Vytváranie bolo zastavené."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Dĺžka/hodnoty:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Vytváranie zastavené"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automaticky zvyšovať"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Načítavam listview..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Povoliť &null"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Priečinok treba vyprázdniť pred vymazaním."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atribúty:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Priečinok nie je prázdny"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexácia"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Premenovanie zrušené"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "Žiad&ny"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Premenovanie prvku listview typu %1 zatiaľ nie je funkčné."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primárny"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkcia zatiaľ nie je realizovaná"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Vami zadaný názov je neplatný!\n"
+"Proces premenovania bol zastavený."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Jedinečný"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Strana %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Zadali ste neplatný názov atribútu objektu."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Zadajte názov diagramu"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Názov atribútu objektu je neplatný"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Zadajte nový názov diagramu:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Názov atribútu objektu ktorý ste zvolili sa už v tejto operácii používa."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Názov atribútu objektu nie je jedinečný"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Zobrazenie"
+"Chystáte sa vymazať celý diagram.\n"
+"Chcete naozaj pokračovať?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Nastavenia zobrazenia tried"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Vymazať diagram?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Farby diagramov"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Exportujem pohľad..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Vami zadaný názov je neplatný."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Chyba pri exporte obrázka:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Vami zadaný názov nie je jedinečný."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Súbor %1 už existuje.\n"
+"Mám ho prepísať?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Typ:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Súbor už existuje."
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Nastavenia Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Nie je možné vytvoriť priečinok: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Užívateľské rozhranie"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Prázdny diagram nie je možné uložiť"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Nastavenia užívateľského rozhrania"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Nastala chyba pri ukladaní diagramu v %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Farba čiary:"
+#: 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 ""
+"Podržte klávesu SHIFT alebo CTRL pre pohyb po osi X. Podržte klávesy SHIFT a "
+"CTRL spolu pre pohyb po osi Y. Pre zrušenie pohybu kliknite pravým tlačidlom "
+"myši."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Š&tandardná farba"
+#: 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 ""
+"Podržte klávesu SHIFT alebo CTRL pre pohyb po osi X. Podržte klávesy SHIFT a "
+"CTRL spolu pre pohyb po osi Y. Pre zrušenie zmeny veľkosti kliknite pravým "
+"tlačidlom myši."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Farba výplne:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Š&tandardná farba"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synchrónna správa"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Šírka čiary:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynchrónna správa"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Š&tandardná šírka"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Popisok"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "P&oužiť farbu výplne"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Poznámka"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Povoliť návrat späť (undo)"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Obdĺžnik"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Použiť diagramy so záložkami"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Vzťah"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Použiť nové generátory pre C++/Java/Ruby"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Asociácia so smerovaním"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Použiť lomené asociačné čiary"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementácia (zovšeobecnenie/realizácia)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatické ukladanie"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Hlboká história"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "A&ktivovať automatické ukladanie"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Plytká história"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Interval pre automatické ukladanie (v minútach):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Spojiť"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Nastaviť príponu pre automatické ukladanie:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Vetviť"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Súbor pre automatické ukladanie bude zapísaný do ~/autosave.xmi v prípade že "
-"automatické ukladanie nastane pred ručným uložením súboru.</p>"
-"<p>Ak súbor už bol uložený, autimatické ukladanie použije ten istý priečinok a "
-"pridá k menu súboru príponu pre automatické ukladanie.</p>"
-"<p>V prípade keď sa prípona uloženého súboru zhoduje s príponou pre automatické "
-"ukladanie, starší súbor bude automaticky prepísaný novou verziou počas "
-"automatického ukladania.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Križovatka"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Spustenie"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Výber"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Logo pri spustení"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Prechod medzi aktivitami"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Tip dňa"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Správa"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Načítať posledný projekt"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "UNDEFINED"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Začať nový projekt s týmto diagramom:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Vybrať"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "bez diagramov"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Diagram tried"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Diagram prípadov použitia"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sekvenčný diagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagram spolupráce"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Zobraziť &operácie"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Stavový diagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Diagram aktivity"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Vyprázdniť diagram"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagram komponentov"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagram zavedenia"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Zovšeobecnenie"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Nastavenia triedy"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Zobraziť &viditeľnosť"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Zobraziť &atribúty"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Názov asociácie"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Zobraziť &operácie"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Zobraziť &stereotyp"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Zobraziť signatúru atribútu"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Zobraziť balík"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Š&tandardný"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Počiatočná viditeľnosť"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Štandardná viditeľnosť atribútu:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Lomka-lomka (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Štandardná viditeľnosť operácie:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Lomka-hviezda (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generovanie zdrojového kódu"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Štýl:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Nastavenie generovania zdrojového kódu"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Generovanie kódu C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Nastavenie zobrazenia zdrojového kódu"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Generovanie tela metód"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Vlastnosti operácie"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Pre triedy v generovanom kóde použiť:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Abstraktná operácia"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Oblasť &klasifikácie (\"statická\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Otázka (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Premenný</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Chrán&ený"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementácia"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametre"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Nový &parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Zadali ste neplatný názov parametra."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Zoznam</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Názov parametra nie je platný"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Názov parametra, ktorý ste zvolili\n"
-"sa už v tejto operácii používa."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Názov parametra nie je jednoznačný"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Názov parametra, ktorý ste zvolili sa už v tejto operácii používa."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Názov triedy"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Zadali ste neplatný názov operácie."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Vložiť súbor</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Názov operácie nie je platný"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generovať projekt"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Už exisuje operácia s touto signatúrou: %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Generovať dokument zostavenia ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Vyberte iný zoznam názvov alebo parametrov"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Automaticky generovať metódy"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Vlastnosti role A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Prázdne konštruktory"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Vlastnosti role B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Metódy pre prístup k asociáciám"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Viditeľnosť role A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Metódy pre prístup k atribútom"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Vlastnosti role B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Od rodičovského objektu"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Zameniteľnosť role A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Štandardná viditeľnosť prístupu k atribútu:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Zameniteľnosť role B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Štandardná viditeľnosť asociačného poľa:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Obsiahnuté prvky"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Od rodičovskéj roly"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Dokumentácia poznámok"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generovanie kódu Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Nový &atribút"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Maltézsky kríž (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Nová &operácia"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Begin-End (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Šablóny"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generovanie kódu Ruby</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Nová ša&blóna..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Jazyk"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Literály enumeračného typu"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Priečinky"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Nový &literál enumeračného typu..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Zapísať všetky generované súbory do priečinku:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atribúty objektu"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Pr&echádzať"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Nový &atribút objektu"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Pr&echádzať"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Počiatočná aktivita"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Vložiť hlavičkové súbory z adresára:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Konečná aktivita"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Súbory vygenerované generátorom zdrojového kódu budú zapísané do tohto "
+"priečinku."
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Typ aktivity:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Súbory v tomto priečinku budú použité ako hlavičkové súbory v generovanom "
+"zdrojovom kóde. "
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Názov aktivity:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Pravidlá pre prepísanie"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Farby prvkov komponentu"
+#: 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 ""
+"Ak existuje súbor s názvom totožným s tým, ktorý chce použiť generátor "
+"zdrojového kódu pre výstup:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Vlastnosti atribútu"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Prepísať"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "Počiatočná &hodnota:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Prepísať súbory, ktoré už existujú v cieľovom priečinku"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Verejný"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "O&pýtať sa"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Zadali ste neplatný názov atribútu."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Ak existuje súbor s rovnakým názvom, opýtať sa, aký bude ďalší krok."
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Názov atribútu je neplatný"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "Použiť &iný názov súboru."
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Názov parametra, ktorý ste zvolili sa už v tejto operácii používa."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Ak už existuje súbor s rovnakým názvom v cieľovom adresári, vybrať iný názov "
+"pridaním prípony k názvu súboru. "
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Názov atribútu nie je jedinečný"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formátovanie"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Vybrať operáciu"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Čiary"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Poradové číslo:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Štýl zakončenia čiar:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operácia triedy:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Typ zarážok:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Užívateľom definovaná operácia:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Miera zarovnania:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagramy"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Aktuálny diagram"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Všetky diagramy"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Bez zarovnania"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "Vy&brať diagramy"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulátor"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Typ diagramu"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Medzera"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Výber"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Výrečnosť komentárov"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Spolupráca"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Zapísať komentáre pre sekcie aj keď sú prázdne."
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvencia"
+#: 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 ""
+"Zapísať komentáre pre jednotlivé sekcie (public, private, atď.) v triede, aj "
+"keď sú tieto komentáre prázdne."
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Zavedenie"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Zapísať dokumentačné komentáre aj keď nie sú zadané."
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Nevybrali ste žiadne diagramy."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Zapísať komentáre pre dokumentáciu &tried a metód aj keď je dokumentácia "
+"prázdna."
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Možnosti zobrazenia"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Nastavenia jazykov"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Nastavenia atribútov"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Asistent generovania zdrojového kódu"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Nastavenia operácií"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Vybrať triedy"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Nastavenia šablón"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Umiestnite všetky triedy, pre ktoré chcete generovať zdrojový kód do zoznamu "
+"na pravej strane."
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Nastavenia literálov enumeračného typu"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Pridajte triedu pre generovanie zdrojového kódu"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Nastavenia atribútov objektu"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Vybrané triedy"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Nastavenie obsahu"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Vynechať triedu z generovania zdrojového kódu"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Asociácie"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Dostupné triedy"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Asociácie tried"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Stav generovania zdrojového kódu"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Operácie"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Stlačte tlačidlo generácie pre spustenie generovania kódu."
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Viditeľnosť"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Stav generovania"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Si&gnatúra operácie"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Zobraziť skryté bloky"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Balík"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">sem patrí názov komponentu</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&Atribúty"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Stereotyp"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Zobraziť typ bloku"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Signa&túra atribútu"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Farby"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Zobraziť ako kružnicu"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Písmo:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Počiatočný stav"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papier:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Konečný stav"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Vybrané:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Typ stavu:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">blok UML objektu:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Názov stavu:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skrytý blok</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Farba prvku komponentu"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Neprepísateľný text:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nová_trieda"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Prepísateľný text:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nová trieda"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Vlastnosti diagramu"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atribúty triedy"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zväčšenie:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "operácie triedy"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Vlastnosti parametra"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Zobraziť &mriežku"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Smer podávania"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Pri&pojiť k mriežke"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Pripojiť veľkosť komponentov"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" je parameter len pre čítanie, \"out\" je parameter iba pre zápis a "
-"\"inout\" je parameter pre čítanie aj zápis."
+"Fixovať veľkosť komponentov, aby bola násobkom jednotky mriežky.\n"
+"Ak je \"pripevniť k mriežke\" povolené, komponent bude vždy v súlade s "
+"mriežkou na všetkých šytroch stranách."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generovať"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Jednotka mriežky:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Hotovo"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Zdrojový kód je vygenerovaný"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Generovanie nevykonané"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Šírka čiary:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ešte nevygenerované"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exportovať všetky pohľady.."
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Priečinok %1 neexistuje. Chcete ho vytvoriť?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "Priečinok na ukla&danie diagramov:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Priečinok na zápis neexistuje"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Základný priečinok na ukladanie obrázkov"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Vytvoriť adresár"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Typ &obrazu:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Nevytvárať"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Použiť p&riečinky"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Chyba pri vytváraní priečinka.\n"
-"Prosím skontrolujte vaše práva pre nadradený priečinok alebo vyberte iný "
-"priečinok."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Chyba pri vytvární priečinku"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Vyberte platný priečinok prosím."
+"Vytvoriť stromovú štruktúru v cieľovom priečinku\n"
+"ktorá zodpovedá štruktúre pohľadov dokumentu"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Priečinok na ukladanie existuje ale nie je možné doň zapisovať.\n"
-"Prosím nastavte práva na zápis alebo vyberte iný priečinok."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Nastala chyba pri zápise do priečinka."
+"Pohľady sú uložené v priečinkoch dokumentu. Taká istá stromová štruktúra "
+"môže byť vytvorená vo vybranom základnom priečinku použitím tohto "
+"nastavenia.\n"
+"V základnom priečinku sa nachádzajú iba priečinky vytvorené užívateľom "
+"(Logický pohľad, Pohľad prípadov použitia atď nie sú v tomto priečinku "
+"vytvorené)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 zrejme nie je priečinok. Prosím vyberte právoplatný priečinok."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Zamenitešnosť role"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Prosím vyberte právoplatný priečinok."
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Viditeľnosť role"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Cieľový súbor už existuje"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportovať"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Súbor %1 už existuje v adresári %2.\n"
-"\n"
-"Umbrello súbor prepísať, vybrať podobný názov alebo\n"
-"nevygenerovať súbor."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Aplikovať pre ostatné súbory"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Prepísať"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Generovať podobný názov súboru"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Negenerovať súbor"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nie sú dostupné žiadne voľby.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Násobnosť"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Zadajte násobnosť:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Názov asociácie"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Zadajte názov asociácie:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Názov role"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Zadajte názov role:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Zadajte názov operácie:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Zadajte nový text:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "CHYBA"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Zmeniť text"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Zarovnať doľava"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Zarovnať doprava"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "Dia&gram"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Zarovnať hore"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nový"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Zarovnať nadol"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Zobraziť"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Zarovnať zvisle do stredu"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zväčšenie:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Zarovnať vodorovne do stredu"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kód"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Zarovnať zvisle na okraje"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktívny &jazyk"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Zarovnať vodorovne na okraje"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Je nutné vybrať najmenej 2 objekty (triedy, aktéri,...) na zarovnanie. "
-"Asociácie nie je možné zarovnávať."
+"<p>Vitajte v Umbrello.</p>\n"
+"<p>UML diagramy umožňujú vývoj a dokumentáciu objektovo orientovaního "
+"softvéru.  <a href=\"help:/umbrello\">Umbrello Handbook</a> je dobrý úvod do "
+"UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Toto je kľúčové slovo jazyka nastaveného generátora kódu."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Vyhradené kľúčové slovo"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Exportujem pohľad..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Vitajte v Umbrello 1.5. Novinky v tejto verzii sú: asociačné triedy, "
+"generátor kódu Ruby, externé priečinky, možnosť zmeniť rozhrania "
+"(interfaces) na triedy, atď.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Chyba pri exporte obrázka:\n"
+"<p>Diagramy so záložkami a externé priečinky sa navzájom vylučujú. Ak "
+"potrebujete externé priečinky musíte odznačiť &quot;Použiť diagramy so "
+"záložkami&quot; vo Všeobecných nastaveniach.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Súbor %1 už existuje.\n"
-"Mám ho prepísať?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Súbor už existuje."
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "nový_aktér"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nový_prípad_použitia"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nový_balík"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nový_komponent"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "nový_uzol"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "nový_artefakt"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nové_rozhranie"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "nový_údajový_typ"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "nový_enumeračný_typ"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nový_objekt"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nový_priečinok"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nový_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Prázdny"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Zle vytvorený argument"
+"f<p>U väčšiny prvkov diagramov nie je možné zmeniť ich veľkosť, zmenia svoju "
+"veľkosť sami podľa svojho obsahu. Veľkosť obdĺžnikov, poznámok a správ v "
+"sekvenčných diagramoch je možné zmeniť - stačí kliknúť a potiahnuť červený "
+"štvorec.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Neznámy typ argumentu"
+#: 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 ""
+"<p>Ak chcete pridať existujúcu triedu, stačí pretiahnuť záznam zo stromového "
+"pohľadu.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nepovolené meno metódy"
+#: 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 ""
+"<p>Nástroj pre refactoring umožňuje presun operácií medzi triedou a jej "
+"odvodenými a základnými triedami. Kliknite na triedu pravým tlačidlom myši "
+"pre otvorenie nástroja pre refactoring.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Neznámy návratový typ"
+#: 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 ""
+"<p> Objekty v sekvenčných diagramoch môžu mať značku deštrukcie a môžu tiež "
+"byť zobrazené ako aktéri. Ak dvakrát kliknete na takýto objekt, zobrazí sa "
+"dialóg Vlastnosti.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Neznáma chyba"
+#: 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 ""
+"<p>Správy sekvenčných diagramov môžu byť použité ako konštruktory.  Kliknite "
+"na objekt (namiesto na zvislú čiaru) ak chcete vytvoriť konštruktor.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Pridať základnú triedu"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Sekvenčné diagramy podporujú posielanie správ samým sebe.  Kliknite opäť "
+"na tú istú zvislú čiaru ak chcete vytvoriť takúto správu.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Pridať odvodenú triedu"
+#: 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 ""
+"<p>Ak je listview prázdny po načítaní súboru, skúste uložiť model pod iným "
+"menom, zatvorte súbor a otvorte duplikát. Obsah listview by mal byť správne "
+"vygenerovaný.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Pridať operáciu"
+#: 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 ""
+"<p>Príkazy Vystrihnúť a Kopírovať vložia do schránky aj obrázok vo formáte "
+"PNG, ktorý môžete vložiť do KWordu alebo do inej aplikácie.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Pridať atribút"
+#: 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 ""
+"<p>Asociácie nemusia byť iba priame čiary- Kliknite dvakrát na čiaru a "
+"vytvoríte pohyblivý bod.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Pridať základné rozhranie"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Automatické ukladanie môžete nastaviť v dialógu \"Nastaviť Umbrello\"</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Pridať odvodené rozhranie"
+#: 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 ""
+"<p>Chýba vám nejaká vlastnosť z programu Umbrello? Dajte nám vedieť.\n"
+"Kontaktné adresy sú na našej internetovej stránke:</p>\n"
+"<p><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Základné klasifikátory"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Vybrané objekty môžete vymazať stlačením klávesu Del alebo Backspace.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Odvodené klasifikátory"
+#: 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 ""
+"<p>Prosím, ak nájdete chybu v programe Umbrello, dajte nám vedieť. Hlásenia "
+"o chybách nám môžete poslať prostredníctvomnástroja \"Poslať správu o chybe"
+"\" z ponuky \"Pomocník\".</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Nie je možné vytvoriť priečinok: %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 ""
+"<p>Stlačením tlačidla Esc sa aktuálny nástroj zmení na nástroj výberu. "
+"Backspace spôsobí skok na predtým použitý nástroj</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Prázdny diagram nie je možné uložiť"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Všetky objekty môžete vybrať stlačením Ctrl+A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Nastala chyba pri ukladaní diagramu v %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 ""
+"<p>Pomocou Asistenta vytvorenia novej triedy v ponuke \"Kód\" môžete "
+"vytvoriť a nastaviť novú triedu.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "nový_ stereotyp"
diff --git a/tde-i18n-sl/messages/tdesdk/umbrello.po b/tde-i18n-sl/messages/tdesdk/umbrello.po
index fd87cfdc4df..89deeb32874 100644
--- a/tde-i18n-sl/messages/tdesdk/umbrello.po
+++ b/tde-i18n-sl/messages/tdesdk/umbrello.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-07-23 23:26+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -21,251 +21,198 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Avtorji modelirnika za UML Umbrello"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Datoteka za odprtje"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2001 Paul Hensgen, (c) 2002-2005 Avtorji modelirnika za UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Avtorji modelirnika za UML Umbrello"
-
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Izvozi kot sliko"
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-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"
-msgstr "Prišlo je to težav pri shranjevanju datoteke: %1"
-
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Napaka pri shranjevanju"
-
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Predmet"
-
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Sinhrono sporočilo"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Gregor Rakar"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asinhrono sporočilo"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gregor.rakar@kiss.si"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Povezava"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Vnesite ime delovanja"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Vsebovanje"
+#: 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 "Vnesite ime novega delovanja:"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Sidro"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Poravnaj levo"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Oznaka"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Poravnaj desno"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Opomba"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Poravnaj navzgor"
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Okvir"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Poravnaj navzdol"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Odvisnost"
-
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
 msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Razmerje"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Smerna povezava"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 msgstr ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
 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 "Razred"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Začetno stanje"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Končno stanje"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Oblikovanje"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Veja/Zlitje"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Razvejitev/Združitev"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalizacija"
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponenta"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Odvisnost"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Vozlišče"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Povezava"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: association.cpp:88
+msgid "Self Association"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Vmesnik"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Sporočilo sodelovanja"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr ""
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sporočilo zaporedja"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: association.cpp:91
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entiteta"
-
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Vsebovanje"
 
-#: worktoolbar.cpp:277
-#, fuzzy
-msgid "Join"
-msgstr "Razvejitev/Združitev"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr ""
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "Razvejitev/Združitev"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizacija"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Sidro"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr ""
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Diagram delovanja"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Delovanje"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stanje"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Končno delovanje"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Začetno delovanje"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Ime povezave"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Sporočilo"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Vnesite ime povezave:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Ime vloge:"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Vnesite ime vloge:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
+"Operacija z enakim imenom in podpisom že obstaja. Ne morete je več dodati."
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Izberite"
+#: 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 "To je neveljavno ime."
+
+#: 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 "Neveljavno ime"
+
+#: 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 "To ime je že uporabljeno"
+
+#: 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 "Ni edinstveno ime"
 
 #: 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."
+"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 ""
 "Vsaj eden od predmetov v odložišču ni bil prilepljen, ker predmet z enakim "
 "imenom že obstaja. Vsi drugi predmeti so bili prilepljeni."
@@ -279,18 +226,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Ni moč odpreti datoteke %1 za pisanje. Prosim preverite, da mapa obstaja in da "
-"imate dovoljenja za pisanje v njo."
+"Ni moč odpreti datoteke %1 za pisanje. Prosim preverite, da mapa obstaja in "
+"da imate dovoljenja za pisanje v njo."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Ni moč odpreti datoteke"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ni moč ustvariti mape:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ni moč ustvariti mape:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -304,1301 +249,1533 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Ni moč ustvariti mape"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Vnesite ime stanja"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Vnesite ime novega stanja:"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Splošne možnosti"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Vnesite delovanje"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paket je imenski prostor"
 
-#: 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 "Vnesite ime novega delovanja:"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Navidezni destruktorji"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "novo delovanje"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Ustvari prazen konstruktor"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Model UML"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logični prikaz"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operacije so notranje"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentni prikaz"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Prikaz razvitja"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Uvažanje datoteke: %1"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model odvisnosti entitete"
+#: 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 "Pripravljen."
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr ""
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Ali je obseg %1 imenski prostor ali razred?"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Trenutna datoteka je bila spremenjena.\n"
-"Ali jo želite shraniti?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Uvoz C++ zahteva vašo pomoč"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Datoteka %1 ne obstaja."
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Imenski prostor"
 
-#: 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 "Napaka pri nalaganju"
+#: 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 "Razred"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Datoteka %1 je očitno okvarjena."
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Notranja napaka"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Ni bilo najdene datoteke XMI v stisnjeni datoteki %1."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Skladenjska napaka pred »%1«"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Prišlo je do težav pri nalaganju izvlečene datoteke: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Napaka razčlenjevanja pred »%1«"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Prišlo je to težav pri nalaganju datoteke: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Prišlo je do težave pri postavljanju datoteke: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "pričakovan izraz"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Skladenjska napaka deklaracije"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagram razreda"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "pričakovan }"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagram zaporedja"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "pričakovan imenski prostor"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagram sodelovanja"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "pričakovan {"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagram stanja"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Pričakovano ime imenskega prostora"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagram delovanja"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Potreben je določitelj tipa za deklaracijo"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagram komponente"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "pričakovana deklaracija"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagram razvitja"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Pričakovan konstanten izraz"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagram odvisnosti entitete"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "Pričakovan »)«"
 
-#: 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 "Ime"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "Manjka }"
 
-#: 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 "Vnesite ime:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Pričakovan inicializator člana"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "To je neveljavno ime za diagram."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Pričakovan inicializator osnovnega razreda"
 
-#: 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 "Neveljavno ime"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Diagram že uporablja to ime."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Pričakovan identifikator"
 
-#: 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 "Ni edinstveno ime"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Pričakovan ID tipa"
 
-#: 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 "To je neveljavno ime."
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Pričakovano ime razreda"
 
-#: 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 "To ime je že uporabljeno"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "pričakovan pogoj"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Ime, ki ste ga vnesli, ni edinstveno.\n"
-"Ali ste to želeli?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "pričakovana izjava"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Ime ni edinstveno"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "pričakovano za inicializacijo"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Use Name"
-msgstr "Ime vloge:"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: 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 "Enter New Name"
-msgstr "Vnesite ime stanja"
+msgid "Properties"
+msgstr "&Lastnosti"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Ali zares želite zbrisati diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Začetno delovanje"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Zbriši diagram"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Končno delovanje"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Nastavljanje dokumenta"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Veja/Zlitje"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Razreševanje referenc predmeta ..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Razvejitev/Združitev"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Nalaganje elementov UML ..."
+#: 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 "Splošno"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Nalaganje diagramov ..."
+#: 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 "Splošne lastnosti"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr ""
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Vrsta delovanja:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/samodejno shranjevanje %1"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ime delovanja:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: 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 "Dokumentacija"
 
-#: umllistview.cpp:416
+#: 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 "Enter Model Name"
-msgstr "Vnesite ime stanja"
+msgid "Font"
+msgstr "Pisava:"
 
-#: umllistview.cpp:417
-#, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "Vnesite novo ime diagrama:"
+#: 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 "Nastavitve pisav"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Prikazi"
+#: 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 "Barva"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Ime, ki ste ga vnesli, je neveljavno.\n"
-"Proces ustvarjanja je bil preklican."
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Barve gradnikov"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ime ni veljavno"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Delovanja"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Ime, ki ste ga vnesli, ni edinstveno.\n"
-"Proces ustvarjanja je bil preklican."
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Novo delovanje ..."
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Ustvarjanje je preklicano"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Zbriši sidro"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Nalaganje seznamskega prikaza ..."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Preimenuj"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Mapa mora biti spraznjena, preden se lahko zbriše."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Novo delovanje"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Mapa ni prazna"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "novo delovanje"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Operacija z enakim imenom in podpisom že obstaja. Ne morete je več dodati."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Preimenuj delovanje"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Vnesite ime delovanja"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Vnesite novo ime delovanja"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "novo stanje"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalizacija"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Vrsta:"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr ""
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Povezave"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Sporočilo sodelovanja"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Lastnosti povezave"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sporočilo zaporedja"
+#: 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 "Splošne nastavitve"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Vloge"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Nastavitve vloge"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizacija"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Pisava povezave"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr ""
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Lastnosti vloge A"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Lastnosti vloge B"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Vidljivost vloge A"
+
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Vidljivost vloge B"
+
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Spremenljivost vloge A"
+
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Spremenljivost vloge B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&New"
-msgstr "&Nov"
+msgid "Rolename:"
+msgstr "Ime vloge:"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Sh&ow"
-msgstr "Pri&kaži"
+msgid "Multiplicity:"
+msgstr "Večkratnost:"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Koda"
+msgid "Public"
+msgstr "Javni"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: 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 "Active &Language"
-msgstr "Aktiven &jezik"
+msgid "Private"
+msgstr "Zasebni"
 
-#. 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
+#: 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 "Documentation"
+msgid "Protected"
+msgstr "Zaščiten"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
 msgstr "Dokumentacija"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Poševnica-poševnica (//)"
+msgid "Changeable"
+msgstr "Možno spreminjanje"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Poševnica-zvezdica (/** */)"
+msgid "Frozen"
+msgstr "Zamrznjen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Style:"
-msgstr "Slog:"
+msgid "Add only"
+msgstr "Samo dodajanje"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Ime &razreda:"
 
-#. 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 "Splošno"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr "Ustvarjanje telesa metode"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Ime paketa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Uporabi naslednje za razrede v ustvarjeni kodi:"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Ime vmesnika:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Ime komponente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Spremenljivka</b>"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "niz"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Ime &entitete:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Niz</p>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Seznam</p>"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Ime &paketa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Izvedljivo"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Ime razreda"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Nariši kot"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Privzeto"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Zapolni:"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Knjižnica"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabela"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Vidnost"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Javno"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&Zaseben"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Za&ščiteno"
+
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "&Dokumentacija"
+
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Ime razreda:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Ustvarjanje projekta"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Metode samodejnega grajenja"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Metode praznega konstruktorja"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Ime komponente:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Ime vozlišča:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: 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 ""
+"Ime, ki ste ga izbrali,\n"
+"je že uporabljeno.\n"
+"Ime je bilo ponastavljeno."
 
-#. 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 "Javni"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Ime ni edinstveno"
 
-#. 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 "Zasebni"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Lastnosti"
 
-#. 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 "Zaščiten"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "No&v atribut ..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Od matičnega predmeta"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacije"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "No&va operacija ..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Predloge"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "No&va predloga ..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Od vloge matičnega"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributi entitete"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Ustvarjanje kode v javi</p>"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "No&v atribut entitete ..."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Zbriši sidro"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Lastnosti"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Prikaži"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Opera&cije"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Vidnost"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "&Podpis operacije"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributi"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Podpis atr&ibuta"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Nariši kot krog"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Zaslon"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Možnosti prikaza"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Nastavitve atributa"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Nastavitve operacije"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Nastavitve predloge"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Nastavitve atributa entitete"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Vsebovanje"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Nastavitve vsebine"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Razredne povezave"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nov_razred"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nov Razred"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributi razreda"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operacije razreda"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Možnosti ustvarjanja kode"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Ustvari"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Mape"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Končaj"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Zapiši vse ustvarjene datoteke v mapo:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Koda je ustvarjena"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Brskaj ..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ni ustvarjena"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&Brskaj ..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ni še ustvarjena"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Imenik %1 ne obstaja. Ali ga želite ustvariti sedaj?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Datoteke, ustvarjene z generatorjem kode, bodo zapisane v to mapo"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Izhodni imenik ne obstaja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Ni moč ustvariti mape"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "&Ne ustvari datoteke"
+
+#: dialogs/codegenerationwizard.cpp:168
+#, fuzzy
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
+"Imenik ni bil ustvarjen.\n"
+"Prosim preverite, da imate dostop do pisanja v njegove matične imenike ali "
+"pa izberite drug, veljaven imenik."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Politika nadomeščanja"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Napaka pri ustvarjanju imenika"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "Prosim izberite veljaven imenik."
+
+#: dialogs/codegenerationwizard.cpp:184
+#, fuzzy
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Če že obstaja datoteka z enakim imenom kot je datoteka,\n"
-"ki jo želi generator kode uporabiti za izhodno datoteko:"
+"Izhodni imenik obstaja, vendar ni zapisljiv.\n"
+"Prosim nastavite primerna dovoljenja ali pa izberite drug imenik."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Nadomesti"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "Napaka pri pisanju v izhodni imenik"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Nadomesti obstoječe datoteke, če obstajajao v ciljni mapi"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 očitno ni imenik. Prosim izberite veljaven imenik."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Vprašaj"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "Prosim izberite veljaven imenik"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Če že obstaja datoteka z enakim imenom, vprašaj, kaj narediti"
+msgid "Code Viewer"
+msgstr "Pregledovalnik kode"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Uporabi drugo ime"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Na voljo ni možnosti.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrami"
+
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
+
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Trenuten diagran"
+
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Vsi diagrami"
+
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Izbrani diagrami"
+
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "V&rsta diagrama"
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Izbor"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
-"Če datoteka že obstaja v ciljni mapi, uporabi drugo ime tako, da se doda "
-"pripona k imenu datoteke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Oblikovanje"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Sodelovanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Črte"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Zaporedje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Slog konca vrstice:"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Vrsta zamikanja:"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Količina zamikanja:"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Razvitje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Ni izbranega diagrama."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr ""
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Ciljna datoteka že obstaja"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Datoteka %1 že obstaja v %2.\n"
+"\n"
+"Umbrello lahko nadomesti datoteko, ustvari podobno\n"
+"datoteko ali pa ne ustvari te datoteke."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Uporabi na vseh preostalih datotekah"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Brez zamikanja"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Nadomesti"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulator"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "U&stvari podobno ime datoteke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Presledek"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Ne ustvari datoteke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Zgovornost komentarjev"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Lastnosti parametra"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "Zapi&ši komentarje za razdelke, tudi če so ti prazni"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Vrsta:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Ime:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Začetna vrednost:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Smer prehoda"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Zapiši komentarje, da se označi različne razdelke (javne, zasebne ...) v "
-"razredu, tudi če so razdelki prazni"
+"»in« je parameter samo za branje, »out« je parameter samo za pisanje in "
+"»inout« je parameter samo za branje in pisanje."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Zapiši komentarje k dokumentaciji, tudi če je prazna"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Vsebovani predmeti"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Z&apiši komentarje za dokumentacijo razredov in metod, tudi če je prazna"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Izberite operacijo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Možnosti jezika"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Številka zaporedja:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Čarovnik za ustvarjanje kode"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Razredna operacija:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Izberite razrede"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Prilagojena operacija:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Nastavitve Umbrella"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Uporabniški vmesnik"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Nastavitve uporabniškega vmesnika"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Barva črte:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "P&rivzeta barva"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Barva polnitve"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Pri&vzeta barva"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Širina črte:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Privzeta &širina"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Uporabi zapolnitveno barvo"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Postavite vse razrede, za katere želite ustvariti\n"
-"kodo, v seznam na desni strani"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Dodaj razred za ustvarjanje kode"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Omogoči razveljavitve"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Izbrani razredi"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Odstrani razred iz ustvarjanja kode"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Razpoložljivi razredi"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Vnesite ime povezave:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Stanje ustvarjanja kode"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Samoshranjevanje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Pritisnite gumb »Ustvari« za začetek ustvarjanja kode"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "O&mogoči samodejno shranjevanje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Stanje ustvarjanja"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Izberite časovni interval samodejnega shranjevanja (minute):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Pregledovalnik kode"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Izberite pripono samodejnega shranjevanja:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Prikaži skrite bloke"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">tukaj ime komponente</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Zagon"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Prikaži vrsto bloka"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Slika pri za&gonu"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Barve"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Nasvet dneva"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Pisava:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Na&loži zadnji projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Začni nov projekt z:"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Brez diagrama"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Razredni diagram"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Izbrano:"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagram zaporedja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Predmetni blok UML:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagram sodelovanja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skriti blok:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagram stanja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Neurejevalno besedilo:</p>"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagram delovanja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Urejevalno besedilo:</p>"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagram komponent"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Lastnosti diagrama"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagram razvitja"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ime:"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Nastavitve razreda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Povečava:"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Prikaži &vidnost"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Prikaz lastnosti"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Prikaži operacije"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Prikaži podpis atributa"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Prikaži paket"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Prikaži podpis operacije"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Prikaži &mrežo"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Začetni obseg"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Pripni &na mrežo"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Privzet obseg atributa:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Pripni velikost komponent"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Privzet obseg operacije:"
 
-#. 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."
-msgstr ""
-"Pripne velikosti komponent, da so večkratnik razmika mreže.\n"
-"Če je omogočena možnost »Pripni na mrežo«, bodo komponente vedno poravnane z "
-"mrežo na vseh štirih stranicah."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Ustvarjanje kode"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Razmik mreže:"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Nastavitve ustvarjanja kode"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Nastavitve pregledovalnika kode"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Začetno stanje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Širina črte:"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Končno stanje"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Izvozi kot sliko"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Vrsta stanja:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Ime stanja:"
 
-#. 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"
-msgstr ""
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Barve gradnikov"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Vrsta stanja:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Lastnosti atributa"
 
-#. 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/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "mapa"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Javen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Zašči&ten"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "&Dokumentacija"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Vnesli ste neveljavno ime atributa."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Ime atributa neveljavno"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ime atributa, ki ste ga izbrali, je že uporabljeno v tej operaciji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Lastnosti vloge"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Ime atributa ni edinstveno"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Ime vloge:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Lastnosti atributa entitete"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Večkratnost:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Privzeta vrednost:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Spremenljivost vloge"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Dolžina/Vrednosti:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Samo dodajanje"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Samodejno povečaj"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zamrznjen"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Dovoli &null (nič)"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Možno spreminjanje"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributi:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Vidljivost vloge"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksiranje"
 
-#. 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 "Dokumentacija"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Brez"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Dobrodošli v Umbrello.</p>\n"
-"<p>Z diagrami UML lahko zasnujete in dokumentirate predmetno usmerjeno "
-"programje. <a href=\"help:/umbrello\">Priročnik za Umbrello</a> "
-"je dober uvod za uporabo UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Glavno"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Edinstveno"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Vnesli ste neveljavno ime atributa entitete"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Če želite dodati obstoječi razred v diagram, potem njegov vnos samo "
-"potegnite iz drevesnega prikaza.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Ime atributa entitete ni veljavno"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Ime atributa entitete, ki ste ga izbrali, je že uporabljeno v operaciji."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Ime atributa entitete ni edinstveno"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Lastnosti operacije"
 
-#: 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/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 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"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametri"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Ni potrebno, da so povezave ravne črte. Dvojni klik na črto bo ustvarilo "
-"premikajočo točko.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&v parametrer ..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>V nastavitvenem oknu Umbrella lahko vključite samodejno shranjevanje.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Vnesli ste neveljavno ime parametra."
 
-#: tips.txt:76
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Ime parametra neveljavno"
+
+#: dialogs/umloperationdialog.cpp:339
 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"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
+"Ime parametra, ki ste ga izbrali, \n"
+"je že uporabljen v tej operaciji."
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Ime parametra ni edinstveno"
+
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Vse predmete lahko zbrišete s pritiskom na Del ali Vračalko.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ime parametra, ki ste ga izbrali, je že uporabljen v tej operaciji."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Vnesli ste neveljavno ime operacije."
 
-#: tips.txt:91
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Ime operacije je neveljavno"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operacija s tem podpisom že obstaja v %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Izberite drugo ime ali seznam parametrov."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Lastnosti vloge"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Lastnosti predloge"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Vnesli ste neveljavno ime predloge."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Ime predloge je neveljavno"
+
+#: dialogs/umltemplatedialog.cpp:138
 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"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Ime parametra predloge, ki ste ga izbrali, je že uporabljeno v tej operaciji."
 
-#: 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"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Ime predloge ni edinstveno"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Možnosti prikaza razredov"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Barve diagrama"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Ime, ki ste ga vnesli, je neveljavno."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Ime, ki ste ga vnesli, ni edinstveno."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Ime ni edinstveno"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Vrstica:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Zapolni:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Privzeto"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Uporabi zapolnjevanje"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Izvozi kot sliko"
+
+#: 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:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</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 "Prišlo je to težav pri shranjevanju datoteke: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Napaka pri shranjevanju"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Avtorji modelirnika za UML Umbrello"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Datoteka za odprtje"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>Vse predmete lahko izberete s pritiskom na Ctrl-A.</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
+"(c) 2001 Paul Hensgen, (c) 2002-2005 Avtorji modelirnika za UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Avtorji modelirnika za UML Umbrello"
+
+#: 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 "Ime"
+
+#: 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 "Vnesite ime:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Vnesite ime operacije:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Vnesite novo besedilo:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "NAPAKA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Spremeni besedilo"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "Datoteka %1 ne obstaja."
+
+#: 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 "Napaka pri nalaganju"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Datoteka %1 je očitno okvarjena."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1653,6 +1830,10 @@ msgstr "Nova operacija"
 msgid "Select Operation..."
 msgstr "Izberite operacijo ..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Spremeni besedilo ..."
@@ -1702,6 +1883,19 @@ msgstr "Novo"
 msgid "Rename..."
 msgstr "Preimenuj..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Napaka prilepljanja"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Barva vrstice ..."
@@ -1732,14 +1926,26 @@ msgstr "Notranja napaka"
 msgid "Import Classes..."
 msgstr "Razred ..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: 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 "Doagram komponente ..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Vozlišče"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagram razvitja ..."
@@ -1748,10 +1954,18 @@ msgstr "Diagram razvitja ..."
 msgid "Folder"
 msgstr "Mapa"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entiteta"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagram odvisnosti entitete ..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr ""
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr ""
@@ -1788,6 +2002,18 @@ msgstr "Nov atribut entitete ..."
 msgid "Export as Picture..."
 msgstr "Izvozi kot sliko"
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Vmesnik"
+
+#: 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 "Diagram razreda ..."
@@ -1808,26 +2034,10 @@ msgstr "Diagram zaporedja ..."
 msgid "Collaboration Diagram..."
 msgstr "Diagram sodelovanja ..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Lastnosti"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacije"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Samo javno"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Vidnost"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Podpis operacije"
@@ -1840,11 +2050,6 @@ msgstr "Podpis atributa"
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Prikaži"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribut ..."
@@ -1869,14 +2074,6 @@ msgstr "Barva zapolnjevanja ..."
 msgid "Use Fill Color"
 msgstr "Uporabi barvo zapolnjevanja"
 
-#: 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 "Barva"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1905,10 +2102,26 @@ msgstr ""
 msgid "Package..."
 msgstr "Paket ..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Začetno stanje"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Končno stanje"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stanje ..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Začetno delovanje"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Končno delovanje"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -1954,6 +2167,14 @@ msgstr "Zbriši sidro"
 msgid "Change Association Name..."
 msgstr "Spremeni ime povezave ..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Počisti idagram"
@@ -1988,8 +2209,8 @@ 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
@@ -1998,188 +2219,96 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2005 Avtorji modelirnika za UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Nepravilna uporaba povezav."
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Napaka povezave"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr ""
 
-#: folder.cpp:289
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Datoteka %1 ne obstaja."
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nov_paket"
 
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Datoteka %1 je očitno okvarjena."
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nova_komponenta"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Gregor Rakar"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "novo_vozlišče"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gregor.rakar@kiss.si"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr ""
 
-#: 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 "Pripravljen."
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nov_vmesnik"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
+#: model_utils.cpp:258
+msgid "new_datatype"
 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."
+#: model_utils.cpp:260
+msgid "new_enum"
 msgstr ""
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Ali je obseg %1 imenski prostor ali razred?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Uvoz C++ zahteva vašo pomoč"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Imenski prostor"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nova_entiteta"
 
-#: codeimport/classimport.cpp:34
+#: model_utils.cpp:264
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Uvažanje datoteke: %1"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Notranja napaka"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Skladenjska napaka pred »%1«"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Napaka razčlenjevanja pred »%1«"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "pričakovan izraz"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Skladenjska napaka deklaracije"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "pričakovan }"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "pričakovan imenski prostor"
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "pričakovan {"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Pričakovano ime imenskega prostora"
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Potreben je določitelj tipa za deklaracijo"
-
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "pričakovana deklaracija"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Pričakovan konstanten izraz"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "Pričakovan »)«"
-
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "Manjka }"
+msgid "new_folder"
+msgstr "novo_vozlišče"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Pričakovan inicializator člana"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nova_povezava"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Pričakovan inicializator osnovnega razreda"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nov_predmet"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Pričakovan identifikator"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Prazno"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Pričakovan ID tipa"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Napačno oblikovan argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Pričakovano ime razreda"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Neznan tip argumenta"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "pričakovan pogoj"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Neveljavno ime metode"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "pričakovana izjava"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Neznan vrnjen tip"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "pričakovano za inicializacijo"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Nedoločena napaka"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
 msgstr ""
+"To je rezervirana ključna beseda za jezik nastavljenega generatorja kode"
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Rezervirana ključna beseda"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2193,105 +2322,66 @@ msgstr "Vnesite ime predmeta:"
 msgid "new_parameter"
 msgstr "nov_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Splošne možnosti"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paket je imenski prostor"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Navidezni destruktorji"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Ustvari prazen konstruktor"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Dodaj osnoven razred"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operacije so notranje"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Dodaj operacijo"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Dodaj atribut"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
 msgstr ""
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Stran %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Vnesite ime diagrama"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Vnesite novo ime diagrama:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
-"Zbrisali boste celoten diagram.\n"
-"Ste prepričani?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Zbrišem diagram:"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Preimenovanje preklicano"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkcija še ni izvedena"
-
-#: 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 ""
-"Ime, ki ste ga vnesli, je neveljavno.\n"
-"Proces preimenovanja je bil preklican."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nova_povezava"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Vnesite ime stanja"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nov_atribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Vnesite ime novega stanja:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nova_predloga"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Vnesite delovanje"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operacija"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Nepravilna uporaba povezav."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr ""
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Napaka povezave"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_polje"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "novo stanje"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2447,11 +2537,6 @@ msgstr "&Izvozi kot sliko ..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Izvozi kot sliko"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Lastnosti"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Drsnik povečave"
@@ -2536,6 +2621,13 @@ msgstr "&Dokumentacija"
 msgid "Opening file..."
 msgstr "Odpiranje datoteke ..."
 
+#: 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 "Ustvarjanje novega dokumenta ..."
@@ -2543,15 +2635,15 @@ msgstr "Ustvarjanje novega dokumenta ..."
 #: uml.cpp:673
 #, fuzzy
 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Vse podprte datoteke (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Vse podprte datoteke (*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2)\n"
 "*.xmi|Nestisnjene datoteke XMI (*.xmi)\n"
 "*.xmi.tgz|Stisnjene datoteke XMI z Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Stisnjene datoteke XMI z Bzip2 (*.xmi.tar.bz2)"
@@ -2580,6 +2672,10 @@ msgstr ""
 "*.xmi.tar.bz2|Stisnjena datoteka XMI z Bzip2\n"
 "*|Vse datoteke"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2588,6 +2684,10 @@ msgstr ""
 "Datoteka %1 obstaja.\n"
 "Jo želite nadomestiti?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Nadomesti"
@@ -2623,11 +2723,11 @@ msgstr "Vstavljanje vsebine odložišča ..."
 
 #: 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 ""
-"Umbrello ni mogel prilepiti vsebine odložišča. Predmeti v odložišču so mogoče "
-"napačne vrste."
+"Umbrello ni mogel prilepiti vsebine odložišča. Predmeti v odložišču so "
+"mogoče napačne vrste."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2681,1263 +2781,1262 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr "Izberite kodo za uvoz"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Ime &razreda:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nov_atribut"
 
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr ""
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nova_predloga"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Ime paketa:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operacija"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Ime vmesnika:"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Ime komponente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_polje"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr ""
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Model UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr ""
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logični prikaz"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Ime &entitete:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentni prikaz"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr ""
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Prikaz razvitja"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Ime &paketa:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model odvisnosti entitete"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Trenutna datoteka je bila spremenjena.\n"
+"Ali jo želite shraniti?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Izvedljivo"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Datoteka %1 ne obstaja."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Nariši kot"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Datoteka %1 je očitno okvarjena."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Privzeto"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Ni bilo najdene datoteke XMI v stisnjeni datoteki %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Knjižnica"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Prišlo je do težav pri nalaganju izvlečene datoteke: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabela"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Prišlo je to težav pri nalaganju datoteke: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Javno"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Prišlo je do težave pri postavljanju datoteke: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&Zaseben"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Za&ščiteno"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagram razreda"
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "&Dokumentacija"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagram zaporedja"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Ime razreda:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagram sodelovanja"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr ""
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagram stanja"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr ""
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagram delovanja"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr ""
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagram komponente"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr ""
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagram razvitja"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Ime komponente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagram odvisnosti entitete"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Ime vozlišča:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "To je neveljavno ime za diagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr ""
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Diagram že uporablja to ime."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Ime, ki ste ga izbrali,\n"
-"je že uporabljeno.\n"
-"Ime je bilo ponastavljeno."
+"Ime, ki ste ga vnesli, ni edinstveno.\n"
+"Ali ste to želeli?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Ime ni edinstveno"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Ime vloge:"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Vrstica:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Vnesite ime stanja"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Zapolni:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Ali zares želite zbrisati diagram %1?"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Privzeto"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Zbriši diagram"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Uporabi zapolnjevanje"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Nastavljanje dokumenta"
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Delovanja"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Razreševanje referenc predmeta ..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Novo delovanje ..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Nalaganje elementov UML ..."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Preimenuj"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Nalaganje diagramov ..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Novo delovanje"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/samodejno shranjevanje %1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Preimenuj delovanje"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Vnesite novo ime delovanja"
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "Vnesite ime stanja"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Lastnosti povezave"
+#: umllistview.cpp:417
+#, fuzzy
+msgid "Enter the new name of the model:"
+msgstr "Vnesite novo ime diagrama:"
 
-#: 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 "Splošne nastavitve"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Prikazi"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Vloge"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Ime, ki ste ga vnesli, je neveljavno.\n"
+"Proces ustvarjanja je bil preklican."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Nastavitve vloge"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ime ni veljavno"
 
-#: 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 "Nastavitve pisav"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Ime, ki ste ga vnesli, ni edinstveno.\n"
+"Proces ustvarjanja je bil preklican."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Pisava povezave"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Ustvarjanje je preklicano"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Lastnosti predloge"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Nalaganje seznamskega prikaza ..."
 
-#: 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 "Splošne lastnosti"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Mapa mora biti spraznjena, preden se lahko zbriše."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Vrsta:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Mapa ni prazna"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Ime:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Preimenovanje preklicano"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Vnesli ste neveljavno ime predloge."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Ime predloge je neveljavno"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkcija še ni izvedena"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Ime parametra predloge, ki ste ga izbrali, je že uporabljeno v tej operaciji."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Ime predloge ni edinstveno"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Lastnosti atributa entitete"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Privzeta vrednost:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Dolžina/Vrednosti:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Samodejno povečaj"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Dovoli &null (nič)"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributi:"
+"Ime, ki ste ga vnesli, je neveljavno.\n"
+"Proces preimenovanja je bil preklican."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksiranje"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Stran %1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Brez"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Vnesite ime diagrama"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Glavno"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Vnesite novo ime diagrama:"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Zbrisali boste celoten diagram.\n"
+"Ste prepričani?"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Edinstveno"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Zbrišem diagram:"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Vnesli ste neveljavno ime atributa entitete"
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Končujem ..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Ime atributa entitete ni veljavno"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
-"Ime atributa entitete, ki ste ga izbrali, je že uporabljeno v operaciji."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Ime atributa entitete ni edinstveno"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Zaslon"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Možnosti prikaza razredov"
+"Izbrana datoteka %1 obstaja.\n"
+"Jo želite nadomestiti?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Barve diagrama"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Datoteka že obstaja"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Ime, ki ste ga vnesli, je neveljavno."
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Ni moč ustvariti mape"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Ime, ki ste ga vnesli, ni edinstveno."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ni moč shraniti praznega diagrama"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Vrsta:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Nastavitve Umbrella"
+#: 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:47
-msgid "User Interface"
-msgstr "Uporabniški vmesnik"
+#: 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:47
-msgid "User Interface Settings"
-msgstr "Nastavitve uporabniškega vmesnika"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Predmet"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Barva črte:"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Sinhrono sporočilo"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "P&rivzeta barva"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asinhrono sporočilo"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Barva polnitve"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Oznaka"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Pri&vzeta barva"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Opomba"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Širina črte:"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Okvir"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Privzeta &širina"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Razmerje"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Uporabi zapolnitveno barvo"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Smerna povezava"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Omogoči razveljavitve"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "Vnesite ime povezave:"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Samoshranjevanje"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "O&mogoči samodejno shranjevanje"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Izberite časovni interval samodejnega shranjevanja (minute):"
+msgid "Join"
+msgstr "Razvejitev/Združitev"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Izberite pripono samodejnega shranjevanja:"
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Razvejitev/Združitev"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Zagon"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Slika pri za&gonu"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Nasvet dneva"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Na&loži zadnji projekt"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Začni nov projekt z:"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Brez diagrama"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Razredni diagram"
-
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagram zaporedja"
-
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagram sodelovanja"
-
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagram stanja"
-
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
 msgstr "Diagram delovanja"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagram komponent"
-
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagram razvitja"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Sporočilo"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Nastavitve razreda"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Prikaži &vidnost"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Izberite"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Prikaz lastnosti"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Prikaži operacije"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Prikaži podpis atributa"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Prikaži paket"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Prikaži operacije"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Začetni obseg"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Privzet obseg atributa:"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Počisti idagram"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Privzet obseg operacije:"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Ustvarjanje kode"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalizacija"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Nastavitve ustvarjanja kode"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Nastavitve pregledovalnika kode"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Lastnosti operacije"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Ime povezave"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Zašči&ten"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Privzeto"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Dokumentacija"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametri"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Poševnica-poševnica (//)"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&v parametrer ..."
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Poševnica-zvezdica (/** */)"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Vnesli ste neveljavno ime parametra."
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Slog:"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Ime parametra neveljavno"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Ime parametra, ki ste ga izbrali, \n"
-"je že uporabljen v tej operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Ustvarjanje telesa metode"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Ime parametra ni edinstveno"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Uporabi naslednje za razrede v ustvarjeni kodi:"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ime parametra, ki ste ga izbrali, je že uporabljen v tej operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Vnesli ste neveljavno ime operacije."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Ime operacije je neveljavno"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Spremenljivka</b>"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Operacija s tem podpisom že obstaja v %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Izberite drugo ime ali seznam parametrov."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Lastnosti vloge A"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "niz"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Lastnosti vloge B"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Niz</p>"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Vidljivost vloge A"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Seznam</p>"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Vidljivost vloge B"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Spremenljivost vloge A"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Spremenljivost vloge B"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Vsebovani predmeti"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Ime razreda"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "No&v atribut ..."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Ustvarjanje projekta"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "No&va operacija ..."
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Predloge"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Metode samodejnega grajenja"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "No&va predloga ..."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Metode praznega konstruktorja"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributi entitete"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Od matičnega predmeta"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "No&v atribut entitete ..."
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Začetno delovanje"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Končno delovanje"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Od vloge matičnega"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Vrsta delovanja:"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Ustvarjanje kode v javi</p>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ime delovanja:"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Barve gradnikov"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Lastnosti atributa"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Začetna vrednost:"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Javen"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Mape"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Vnesli ste neveljavno ime atributa."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Zapiši vse ustvarjene datoteke v mapo:"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Ime atributa neveljavno"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Brskaj ..."
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ime atributa, ki ste ga izbrali, je že uporabljeno v tej operaciji."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&Brskaj ..."
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Ime atributa ni edinstveno"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Izberite operacijo"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Datoteke, ustvarjene z generatorjem kode, bodo zapisane v to mapo"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Številka zaporedja:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Razredna operacija:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Politika nadomeščanja"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Prilagojena operacija:"
+#: 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 ""
+"Če že obstaja datoteka z enakim imenom kot je datoteka,\n"
+"ki jo želi generator kode uporabiti za izhodno datoteko:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrami"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Nadomesti"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Nadomesti obstoječe datoteke, če obstajajao v ciljni mapi"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Trenuten diagran"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Vprašaj"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Vsi diagrami"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Če že obstaja datoteka z enakim imenom, vprašaj, kaj narediti"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Izbrani diagrami"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Uporabi drugo ime"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "V&rsta diagrama"
+#: 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 ""
+"Če datoteka že obstaja v ciljni mapi, uporabi drugo ime tako, da se doda "
+"pripona k imenu datoteke"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Izbor"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Oblikovanje"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Sodelovanje"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Črte"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Zaporedje"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Slog konca vrstice:"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Razvitje"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Vrsta zamikanja:"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Ni izbranega diagrama."
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Količina zamikanja:"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Možnosti prikaza"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Nastavitve atributa"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Nastavitve operacije"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Nastavitve predloge"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Brez zamikanja"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulator"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Nastavitve atributa entitete"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Presledek"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Nastavitve vsebine"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Zgovornost komentarjev"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Povezave"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Zapi&ši komentarje za razdelke, tudi če so ti prazni"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Razredne povezave"
+#: 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 ""
+"Zapiši komentarje, da se označi različne razdelke (javne, zasebne ...) v "
+"razredu, tudi če so razdelki prazni"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Opera&cije"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Zapiši komentarje k dokumentaciji, tudi če je prazna"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Vidnost"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Z&apiši komentarje za dokumentacijo razredov in metod, tudi če je prazna"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "&Podpis operacije"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Možnosti jezika"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ket"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Čarovnik za ustvarjanje kode"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributi"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Izberite razrede"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
+"Postavite vse razrede, za katere želite ustvariti\n"
+"kodo, v seznam na desni strani"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Podpis atr&ibuta"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Dodaj razred za ustvarjanje kode"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Nariši kot krog"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Izbrani razredi"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Začetno stanje"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Odstrani razred iz ustvarjanja kode"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Končno stanje"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Razpoložljivi razredi"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Vrsta stanja:"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Stanje ustvarjanja kode"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Ime stanja:"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Pritisnite gumb »Ustvari« za začetek ustvarjanja kode"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Barve gradnikov"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Stanje ustvarjanja"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nov_razred"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Prikaži skrite bloke"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nov Razred"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">tukaj ime komponente</p>"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributi razreda"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operacije razreda"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Prikaži vrsto bloka"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Lastnosti parametra"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Barve"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Smer prehoda"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Pisava:"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
 msgstr ""
-"»in« je parameter samo za branje, »out« je parameter samo za pisanje in »inout« "
-"je parameter samo za branje in pisanje."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Ustvari"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Končaj"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Izbrano:"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Koda je ustvarjena"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Predmetni blok UML:</p>"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ni ustvarjena"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skriti blok:</p>"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ni še ustvarjena"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Neurejevalno besedilo:</p>"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Imenik %1 ne obstaja. Ali ga želite ustvariti sedaj?"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Urejevalno besedilo:</p>"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Izhodni imenik ne obstaja"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Lastnosti diagrama"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Ni moč ustvariti mape"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Povečava:"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "&Ne ustvari datoteke"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:168
-#, fuzzy
-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 ""
-"Imenik ni bil ustvarjen.\n"
-"Prosim preverite, da imate dostop do pisanja v njegove matične imenike ali pa "
-"izberite drug, veljaven imenik."
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Prikaži &mrežo"
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Napaka pri ustvarjanju imenika"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Pripni &na mrežo"
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "Prosim izberite veljaven imenik."
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Pripni velikost komponent"
 
-#: dialogs/codegenerationwizard.cpp:184
-#, fuzzy
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Izhodni imenik obstaja, vendar ni zapisljiv.\n"
-"Prosim nastavite primerna dovoljenja ali pa izberite drug imenik."
-
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Napaka pri pisanju v izhodni imenik"
+"Pripne velikosti komponent, da so večkratnik razmika mreže.\n"
+"Če je omogočena možnost »Pripni na mrežo«, bodo komponente vedno poravnane z "
+"mrežo na vseh štirih stranicah."
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 očitno ni imenik. Prosim izberite veljaven imenik."
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Razmik mreže:"
 
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "Prosim izberite veljaven imenik"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Ciljna datoteka že obstaja"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: 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."
-msgstr ""
-"Datoteka %1 že obstaja v %2.\n"
-"\n"
-"Umbrello lahko nadomesti datoteko, ustvari podobno\n"
-"datoteko ali pa ne ustvari te datoteke."
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Širina črte:"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Uporabi na vseh preostalih datotekah"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Izvozi kot sliko"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Nadomesti"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "U&stvari podobno ime datoteke"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Ne ustvari datoteke"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Vrsta stanja:"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Na voljo ni možnosti.</p>"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "mapa"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+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)."
 msgstr ""
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Ime povezave"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Vnesite ime povezave:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Ime vloge:"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Vnesite ime vloge:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Spremenljivost vloge"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Vnesite ime operacije:"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Vidljivost vloge"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Vnesite novo besedilo:"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "NAPAKA"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Spremeni besedilo"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Poravnaj levo"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nov"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Poravnaj desno"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Pri&kaži"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Poravnaj navzgor"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Povečava:"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Poravnaj navzdol"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Koda"
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr ""
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktiven &jezik"
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: tips:3
+#, fuzzy
+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 ""
+"<p>Dobrodošli v Umbrello.</p>\n"
+"<p>Z diagrami UML lahko zasnujete in dokumentirate predmetno usmerjeno "
+"programje. <a href=\"help:/umbrello\">Priročnik za Umbrello</a> je dober "
+"uvod za uporabo UML.</p>\n"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: 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 ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: 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 ""
 
-#: aligntoolbar.cpp:383
+#: tips:23
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
 
-#: object_factory.cpp:164
+#: tips:30
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 msgstr ""
-"To je rezervirana ključna beseda za jezik nastavljenega generatorja kode"
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Rezervirana ključna beseda"
-
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Končujem ..."
+"<p>Če želite dodati obstoječi razred v diagram, potem njegov vnos samo "
+"potegnite iz drevesnega prikaza.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:36
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:44
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Izbrana datoteka %1 obstaja.\n"
-"Jo želite nadomestiti?"
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Datoteka že obstaja"
-
-#: model_utils.cpp:244
-msgid "new_actor"
+#: 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 ""
 
-#: model_utils.cpp:246
-msgid "new_usecase"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nov_paket"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nova_komponenta"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "novo_vozlišče"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: 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 ""
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nov_vmesnik"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
+#: 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 ""
 
-#: model_utils.cpp:260
-msgid "new_enum"
+#: 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 ""
+"<p>Ni potrebno, da so povezave ravne črte. Dvojni klik na črto bo ustvarilo "
+"premikajočo točko.</p>\n"
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nova_entiteta"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "novo_vozlišče"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nov_predmet"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Prazno"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Napačno oblikovan argument"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Neznan tip argumenta"
-
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Neveljavno ime metode"
-
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Neznan vrnjen tip"
-
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Nedoločena napaka"
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Dodaj osnoven razred"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
+"<p>V nastavitvenem oknu Umbrella lahko vključite samodejno shranjevanje.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Dodaj operacijo"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Dodaj atribut"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base 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:298
-msgid "Add Derived Interface"
-msgstr ""
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr "<p>Vse predmete lahko zbrišete s pritiskom na Del ali Vračalko.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base 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 ""
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
+#: 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:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Ni moč ustvariti mape"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Ni moč shraniti praznega diagrama"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Vse predmete lahko izberete s pritiskom na Ctrl-A.</p>\n"
 
-#: 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"
diff --git a/tde-i18n-sr/messages/tdesdk/umbrello.po b/tde-i18n-sr/messages/tdesdk/umbrello.po
index 91f17dbd81a..dfe02cc044e 100644
--- a/tde-i18n-sr/messages/tdesdk/umbrello.po
+++ b/tde-i18n-sr/messages/tdesdk/umbrello.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-10-01 13:46+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -20,246 +20,207 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello-ов генератор аутономног кода"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "фајл за трансформисање"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "XSLT фајл који треба употребити"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "© 2006 Gael de Chalendar (тпк. Kleag), © 2002-2006 аутори Umbrello-а"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Аутори Umbrello-а, UML моделара"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Топлица Танасковић"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Извозим све приказе..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "toptan@kde.org.yu"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Дошло је до неких грешака при извозу слика:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "Дошло је до проблема приликом снимања фајла: %1"
+#: 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/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 "Грешка при снимању"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Поравнај лево"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Објекат"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Поравнај десно"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Синхрона порука"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Поравнај на врху"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Асинхрона порука"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Поравнај на дну"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Придруживање"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Поравнај усправно у средини"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Садржалац"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Поравнај водоравно у средини"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Сидро"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Поравнај усправно распоређено"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Ознака"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Поравнај водоравно распоређено"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Забелешка"
+#: 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:253
-msgid "Box"
-msgstr "Кутија"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Форматирање"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Актер"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Зависност"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Уопштење"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Агрегација"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Однос"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Дирекционо придруживање"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Имплементира (генерализација-реализација)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Композиција"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "Класа"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Почетно стање"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Завршно стање"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Гранај/Стопи"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Подели/Споји"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Пакет"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Компонента"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Чвор"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Зависност"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Артифакт"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Придруживање"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Интерфејс"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Самопридруживање"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Тип података"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Порука о сарадњи"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Набрајање"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Порука о секвенци"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Ентитет"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Порука о самосарадњи"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Далека историја"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Порука о самосеквенци"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Блиска историја"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Садржалац"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Споји"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Композиција"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Раздвој"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Реализација"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Састав"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Једнострано придруживање"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Избор"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Сидро"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Прелаз стања"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Прелаз активности"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Активност"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Стање"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Вишеструкост"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Завршна активност"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Унесите вишеструкост:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Почетна активност"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Име придруживања"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Порука"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Унесите име придруживања:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "НЕДЕФИНИСАНО"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Име улоге"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Избор"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Унесите име улоге:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "То име није исправно."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Неисправно име"
+
+#: 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 "То име се већ користи."
+
+#: 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 "Није јединствено име"
 
 #: 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."
+"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 ""
-"Бар једна ставка из клипборда није могла бити уметнута зато што ставка са истим "
-"именом већ постоји. Све остале ставке су уметнуте."
+"Бар једна ставка из клипборда није могла бити уметнута зато што ставка са "
+"истим именом већ постоји. Све остале ставке су уметнуте."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -270,18 +231,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Не могу да отворим фајл %1 за упис. Уверите се да фасцикла постоји и да имате "
-"право уписа у њу."
+"Не могу да отворим фајл %1 за упис. Уверите се да фасцикла постоји и да "
+"имате право уписа у њу."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Не могу да отворим фајл"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Не могу да направим фасциклу:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Не могу да направим фасциклу:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1344 +254,1516 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Не могу да направим фасциклу"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Унесите име стања"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Опште опције"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Унесите име новог стања:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Пакет је именски простор"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Унесите активност"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Виртуелни разграђивач"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Унесите име за нову активност:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Генериши празне конструскторе"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "нова активност"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Генериши приступне методе"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML моделар"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Операције су у линији"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Логички приказ"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Приступачи су у линији"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Приказ случаја употребе"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Приступачи су јавни"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Приказ компоненти"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Увозим фајл: %1 Напредак: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Приказ развијања"
+#: 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 "Спреман."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Модел односа међу ентитетима"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Да ли је опсег %1 именски простор или класа?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Типови података"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Увоз C++-а захтева вашу помоћ"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Текући фајл је измењен.\n"
-"Желите ли да га сачувате?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Именски простор"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Фајл %1 не постоји."
+#: 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 "Класа"
 
-#: 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 "Грешка при учитавању"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Унутрашња грешка"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Фајл %1 изгледа покварено."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Синтаксна грешка пре „%1“"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Није нађен ниједан XMI фајл у компресованом фајлу %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Грешка у рашчлањивању пре „%1“"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Дошло је до проблема приликом учитавања распакованог фајла: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Дошло је до проблема приликом учитавања фајла: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "очекиван је израз"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Дошло је до проблема приликом слања фајла: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Синтаксна грешка декларације"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "дијаграм случаја употребе"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "очекивано је }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "дијаграм класе"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "очекиван је именски простор"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "дијаграм секвенце"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "очекивано је {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "дијаграм сарадње"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Очекивано је име именског простора"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "дијаграм стања"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Потребан је спецификатор типа за декларацију"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "дијаграм активности"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "очекивана је декларација"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "дијаграм компоненти"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Очекиван је константан израз"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "дијаграм развијања"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "очекивано је „)“"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "дијаграма односа међу ентитетима"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "Име"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "Унесите име:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Очекиван је спецификатор базне класе"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "То је неисправно име за дијаграм."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Очекивана је клаузула иницијализатора"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Неисправно име"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Очекиван је идентификатор"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Дијаграм већ користи то име."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "Није јединствено име"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "То име није исправно."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "То име се већ користи."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "очекивана је наредба"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Име које сте унели није јединствено.\n"
-"Да ли сте ово желели?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "очекивана је иницијализација for петље"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Име није јединствено"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "очекивано је catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Користи име"
+#: 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 "&Својства"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Унесите ново име"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Почетна активност"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Да ли сте сигурни да желите да обришете дијаграм %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Завршна активност"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Обриши дијаграм"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Гранај/Стопи"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Постављам документ..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Подели/Споји"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Разрешавам референце објекта..."
+#: 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 "Опште"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Учитавам UML елементе..."
+#: 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 "Опште особине"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Учитавам дијаграме..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Тип активности:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-дијаграм"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Име активности:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/аутоматско снимање%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 "Документација"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "Фонт:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "Поставке фонта"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "Боја"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Прикази"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Боје контроле"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Име које сте унели није исправно.\n"
-"Процес прављења је отказан."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Активности"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Име није исправно"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Нова активност..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Име које сте унели није јединствено!\n"
-"Процес прављења је отказан."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Обриши сидро"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Прављење је отказано"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Промени име"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Учитавам приказ листе..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Нова активност"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Фасцикла се мора прво испразнити да би се обрисала."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "нова активност"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Фасцикла није празна"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Промени име активности"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Операција са истим именом и потписом већ постоји. Не можете је поново додати."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Унесите ново име за активност:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Унесите име за активност"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Име:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "ново стање"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Тип:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Уопштење"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Придруживања"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Самопридруживање"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Својства придруживања"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "Опште поставке"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Порука о секвенци"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Улоге"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Порука о самосарадњи"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Поставке улоге"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Порука о самосеквенци"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Фонт придруживања"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Реализација"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Својства улоге „А“"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Једнострано придруживање"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Својства улоге „B“"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Извези"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Видљивост улоге „А“"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Дијаграм"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Видљивост улоге „B“"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Нови"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Променљивост улоге „А“"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Пр&икажи"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Променљивост улоге „B“"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Кôд"
+msgid "Rolename:"
+msgstr "Име улоге:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Активни &језик"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "Документација"
+msgid "Public"
+msgstr "Јавни"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Кроз-кроз (//)"
+msgid "Private"
+msgstr "Приватни"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Кроз-звездица (/**  */)"
+msgid "Protected"
+msgstr "Заштићени"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Стил:"
+msgid "Implementation"
+msgstr "Примена"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Генерисање C++ кôда</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Опште"
+msgid "Frozen"
+msgstr "Замрзнуто"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Генерисање тела метода"
+msgid "Add only"
+msgstr "Додај само"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Користи следеће за класе у генерисаном кôду:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Име &класе:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Име &актера:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Име &пакета:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Променљива</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Име случаја употребе:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Име и&нтерфејса:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Име &компоненте:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Име &артифакта:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Знаковни низ</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "И&ме набрајања:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Листа</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Име типа по&датка:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "И&ме ентитета:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>глобално?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Име &стереотипа:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Име &пакета:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Име класе"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "А&пстрактна класа"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<p align=\"center\">Укључни фајл</p>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Случај коришћења а&пстракције"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Генерисање пројекта"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Извршно"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Направи градитељски ANT документ"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Цртај као"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Аутоматски генериши методе"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "По&дразумевано"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Празни конструкторски методи"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Попуњавање:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Приступни методи придруживања"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Библиотека"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Приступни методи атрибута"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+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 "Јавни"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+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 "Приватни"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+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 "Заштићени"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "П&риватно"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Из родитељског објекта"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Заш&тићено"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Подразумевани опсег приступа атрибута:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "При&мена"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Подразумевани опсег поља придруживања:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Име класе:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Из родитељске улоге"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Име примерка:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Генерисање Java кôда</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Цртај као актера"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hash (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Вишеструки примерак"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Почетак-Крај (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Прикажи разграђивање"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Генерисање Ruby кôда</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Име компоненте:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Име чвора:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
+msgstr ""
+"Име које сте одабрали\n"
+"већ се користи.\n"
+"Име је ресетовано."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Име није јединствено"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Атрибути"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Н&ови атрибут..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Операције"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Н&ова операција..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Шаблони"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Н&ови шаблон..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Литерали набрајања"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "Н&ови литерал набрајања..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Атрибути ентитета"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Н&ов атрибут ентитета..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Обриши сидро"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Својства"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Прикажи"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "О&перације"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Видљивост"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Потпис о&перације"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Па&кет"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Ат&рибути"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Стереот&ип"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Потпис атр&ибута"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Цртај као круг"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Приказ"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Опције приказа"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Поставке атрибута"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Поставке операција"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Поставке шаблона"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Поставке литерала набрајања"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Поставке атрибута ентитета"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Садржалац"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Поставке садржаја"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Придружења класа"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_klasa"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Нова класа"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Атрибути класе"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Операције класе"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Опције за генерисање кôда"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Језик"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Генериши"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Фасцикле"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Завршетак"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Запиши све генерисане фајлове у фасциклу:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Кôд је генерисан"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Пре&гледај..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Није генерисан"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "П&регледај..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Још увек није генерисан"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Укључи заглавне фајлове из фасцикле:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Фасцикла %1 не постоји. Желите ли да је направите сада?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Фајлови направљени генератором кôда биће записани у ову фасциклу"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Излазна фасцикла не постоји"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Направи фасциклу"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Не прави"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Фајлови из ове фасцикле ће бити коришћени као заглавни фајлови у генерисаном "
-"кôду"
+"Фасцикла се не може направити.\n"
+"Проверите да ли имате право уписа у њену родитељску фасциклу или изаберите "
+"другу, исправану, фасциклу."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Политика пребрисавања"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Грешка при прављењу фасцикле"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Изаберите исправну фасциклу."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Ако већ постоји фајл са истим именом какво \n"
-"генератор кôда хоће да користи за свој излазни фајл:"
+"Излазна фасцикла постоји, али се у њу не може писати.\n"
+"Поставите одговарајуће дозволе или изаберите другу фасциклу."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Пре&бриши"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "Пребриши постојеће фајлове ако они постоје у одредишној фасцикли"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 не изгледа као фасцикла. Изаберите исправну фасциклу."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Питај"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Изаберите исправну фасциклу"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Ако фајл са истим именом већ постоји, питај шта да радиш"
+msgid "Code Viewer"
+msgstr "Приказивач кода"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Користи другачије име"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Нема доступних опција.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Дијаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Форматирање"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Филтер"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Линије"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Текући дијаграм"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Стил краја линије:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Сви дијаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Тип увлачења:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Одабери дијаграм"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Величина увлачења:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Тип дијаграма"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Избор"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Случај употребе"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Сарадња"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Без увлачења"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Секвенца"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Табулатор"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Стање"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Размак"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Компонента"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Опширност коментара"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Искориштење"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-дијаграм"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Нема одабраних дијаграма."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Формат у којем ће слике бити извезене"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Документација напомене"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Одредишни фајл већ постоји"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Пиши коментаре &за одељке иако је одељак\n"
-"празан"
+"Фајл %1 већ постоји у %2.\n"
+"\n"
+"Umbrello може да пребрише фајл, направи фајл\n"
+"сличног имена или да га уопше и не направи."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Примени на све преостале фајлове"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Пребриши"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Направи слично име фајла"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Не&мој да правиш фајл"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Својства параметра"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Тип:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Име:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Почетна вредност:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Правац проласка"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Пише коментаре за назнаку другог одељка (јавни, приватни итд.) у класи, чак и "
-"ако су одељци празни"
+"„in“ је параметар само за читање, „out“ је параметар само за уписивање, а "
+"„inout“ је параметар и за читање и за уписивање."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Пиши документацију коментара чак иако су празни"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr "Пиши коментаре &за документацију класе и метода чак иако су празни"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Одаберите операцију"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Опције језика"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Број секвенце:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Чаробњак за генерисање кôда"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Операција класе:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Изаберите класе"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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:30
+msgid "Umbrello Setup"
+msgstr "Подешавање Umbrellо-а"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Кориснички интерфејс"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Поставке корисничког интерфејса"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Боја линије:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "По&дразумевана боја"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Боја за попуњавање:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "По&дразумевана боја"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Ширина линије:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "П&одразумевана ширина"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Користи боју за попуњавање"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"У листу десно сместите све класе за\n"
-"које желите да се генерише кôд"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Додај класу за генерисање кôда"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Укључи опозивање"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Изабране класе"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Користи дијаграме са језичцима"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Уклони класу из генерисања кôда"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Користите нове C++/Java/Ruby генераторе"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Доступне класе"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Користи угловне линије придруживања"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Статус генерисања кôда"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Аутоматско снимање"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Притисните дугме за генерисање за почетак генерисања кôда"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Укључи аутоматско снимање"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Статус генерисања"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Одаберите период аутоматског снимања (минута):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Приказивач кода"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Поставите суфикс аутоматског снимања:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Прикажи скривене блокове"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Ако нисте већ једном ручно снимили фајл, при аутоматском снимању фајл "
+"ће бити именован ~/autosave.xmi.</p><p>Ако јесте већ једном снимили, при "
+"аутоматском снимању биће направљен фајл у истој фасцикли и истог имена, али "
+"са додатком наведеног суфикса.</p><p>Ако је суфикс исти као суфикс фајла "
+"који сте снимили, аутоматско снимање ће пребрисати тај фајл.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">овде иде име компоненте</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Покретање"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Прикажи тип блока"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Лого п&ри покретању"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Боје"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Савет дана"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Фонт:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Учитај последњи пројекат"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Папир:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Почни нови пројекат:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Изабрано:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Без дијаграма"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML блок објекта:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Дијаграм класа"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Скривени блок:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Дијаграм случаја употребе"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Неизменљив текст:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Дијаграм секвенци"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Уредив текст:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Дијаграм сарадње"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Својства дијаграма"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Дијаграм стања"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Име:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Дијаграм активности"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Увеличавање:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Дијаграм компоненти"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Дијаграм развијања"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Поставке класе"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Прикажи &видљивост"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Прикажи атрибуте"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Прикажи операције"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Пр&икажи стереотип"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Прикажи потпис атрибута"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Прикажи пакет"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Прикажи потпис операције"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Прикажи &мрежу"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Почетни опсег"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Уклапај уз мрежу"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Подразумевани опсег атрибута:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Величина компоненте уклапања"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+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."
-msgstr ""
-"Поставља величину компоненте тако да она буде умножак размака у мрежи.\n"
-"Ако је укључена опција „уклапај уз мрежу“ компонента ће увек бити поравната са "
-"мрежом на све четири стране."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Генерисање кôда"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Размак у мрежи:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Поставке генерисања кôда"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Поставке приказивача кôда"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Почетно стање"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Ширина линија:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Завршно стање"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Извези све приказе"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Тип стања:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Фасцикла у којој се снимају дијаграми:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+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"
-msgstr "Основна фасцикла за снимање слика"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Боја контроле"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Тип слике:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+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"
-msgstr "Формат у којем ће слике бити извезене"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Оп&сег класификатора („static“)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Користи &фасцикле"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Јавно"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Направи у циљној фасцикли исту структуру стабла каква се\n"
-"користи у документу за складиштење приказа"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "З&аштићено"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "При&мена"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Унели сте неисправно име атрибута."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Неисправно име атрибута"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Прикази се држе у фасциклама у документу. Иста структура стабла која се користи "
-"у документу може бити направљена у изабраној основној фасцикли на диску.\n"
-"Само фасцикле које је направио корисник праве се у основној фасцикли (логички "
-"приказ, прикази случајева употребе, и слични, не праве се)."
+"The attribute name you have chosen 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"
-msgstr "Својства улоге"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute 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:"
-msgstr "Име улоге:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Својства атрибута ентитета"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Вишеструкост:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Подразумевана вредност:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Изменљивост улоге"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Дужина/вредности:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Додај само"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Аутоматско увећање"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Замрзнуто"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Дозволи &нулто"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Измењиво"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Атрибути:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Видљивост улоге"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Индексирање"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Примена"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+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"
-msgstr ""
-"<p>Добродошли у Umbrello.</p>\n"
-"<p>Помоћу UML дијаграма можете дизајнирати и документисати објектно "
-"оријентисани софтвер.  <a href=\"help:/umbrello\">Приручник за Umbrello</a> "
-"је добар увод у коришћење UML-а.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Примарно"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Добродошли у  Umbrello 1.5.  Ново у овој верзији су класе придруживања, "
-"генерација Ruby кода, екстернализација фасцикли, могућност претварања "
-"интерфејса у класе и још много тога.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Индекс"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Дијаграми са језичцима и Спољне фасцикле се међусобно искључују. Ако вам "
-"требају Спољне фасцикле онда демаркирајте &quot;Користи дијаграме са "
-"језичцима&quot; у општим подешавањима.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&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"
-msgstr ""
-"<p>Већини дијаграмских ставки не може да се промени величина, већ ће то учинити "
-"саме да би се прилагодиле свом садржају.\n"
-"Кутијама, белешкама и порукама дијаграма секвенце величина може бити промењена "
-"кликом на и повлачењем црвеног квадрата.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Унели сте неисправно име атрибута ентитета."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Ако желите у дијаграм да додате класу која већ постоји, само превуците њен "
-"унос из стаблоликог приказа.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Неисправно име атрибута ентитета"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Umbrello-ов рефакторизациони агент вам омогућава да премештате операције "
-"између класе и њених изведених и базних класа.\n"
-"Десно кликните на класу да бисте отворили рефакторизациони агент.</p>\n"
+"Име које сте одабрали за атрибут ентитета већ се користи у овој операцији."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Објекти дијаграма секвенце могу имати кућицу за разграђивање и бити нацртани "
-"као актери. Двокликните на неки за дијалог са својствима.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name 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"
-msgstr ""
-"<p>Поруке дијаграма секвенце могу имати улогу конструктора. Кликните на кутију "
-"објекта (уместо на усправну линију) да је учините конструктором.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Својства операција"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Дијаграми секвенце подржавају поруке за саме себе. Кликните поново на исту "
-"усправну линију да направите аутопоруку.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Апстрактна операција"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Ако се по учитавању страног фајла ништа не појави у приказу листе, покушајте "
-"да снимите модел под другим именом, затворите, и поново учитате снимљени фајл. "
-"Обично ће тада приказ листе бити исправно попуњен.</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Упит („const“)"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Исеци и копирај ће такође извести слику у PNG клипборд, одакле може бити "
-"уметнута у KWord и друге програме.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Параметри"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Придруживања не морају да буду у правим линијама, двоклик на неку ће "
-"направити померљиву тачку.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "Но&ви параметар..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Аутоматско снимање можете укључити у дијалогу за подешавање Umbrello-а.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Унели сте неисправно име за параметар."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Да ли Umbrello нема неку могућност која вам треба? Ако је тако, обавестите "
-"нас.\n"
-"Или је додајте у базу података о грешкама помоћу пријаве грешака из менија "
-"Помоћ, или нам је пошаљите на досписну листу uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Неисправно име параметра"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Све изабране објекте можете обрисати притиском на Del или Backspace.</p>\n"
+"Име које сте одабрали за параметар\n"
+"већ се користи у овој операцији."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Ако сте нашли грешку у Umbrello-у, обавестите нас.\n"
-"Грешке можете послати алатом за пријаву грешака из менија Помоћ.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Име параметра није јединствено"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Притиском на тастер Escape поставља се текући алат на изабрани алат.\n"
-"Backspace-ом се скаче на претходно коришћени алат.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Име које сте одабрали за параметар већ се користи у овој операцији."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Унели сте неисправно име операције."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Неисправно име операције"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Операција са таквим потписом већ постоји у %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Изаберите другачије име или параметарску листу."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Својства улоге"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Својства шаблона"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Унели сте неисправно име за шаблон."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Неисправно име за шаблон"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Можете изабрати све објекте притиском на Ctrl-A.</p>\n"
+"Име које сте одабрали за параметар шаблона већ се користи у овој операцији."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Име шаблона није јединствено"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Опције за приказ класа"
 
-#: tips.txt:108
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Боје за дијаграм"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Име које сте унели није исправно."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Име које сте унели није јединствено."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Име није јединствено"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Линија:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Попуњавање:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "П&одразумевано"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Користи попуњавање"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Извозим све приказе..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+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"
+msgstr "Дошло је до проблема приликом снимања фајла: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Грешка при снимању"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello-ов генератор аутономног кода"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "фајл за трансформисање"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "XSLT фајл који треба употребити"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Можете направити и подесити нову класу користећи чаробњака из менија Кôд.</p>"
-"\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "© 2006 Gael de Chalendar (тпк. Kleag), © 2002-2006 аутори Umbrello-а"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Аутори Umbrello-а, UML моделара"
+
+#: 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 "Име"
+
+#: 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 "Унесите име:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Унесите име операције:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Унесите нови текст:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ГРЕШКА"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Измени текст"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Фајл фасцикле %1 не постоји."
+
+#: 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 "Грешка при учитавању"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Фајл фасцикле %1 се не може отворити."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1686,6 +1817,10 @@ msgstr "Нова операција..."
 msgid "Select Operation..."
 msgstr "Одабери операцију..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Измени текст..."
@@ -1737,6 +1872,19 @@ msgstr "Нови"
 msgid "Rename..."
 msgstr "Преименуј..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Грешка приликом уметања"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Боја линија..."
@@ -1765,14 +1913,26 @@ msgstr "Учини фасциклу унутарњом"
 msgid "Import Classes..."
 msgstr "Увези класе..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Пакет"
+
 #: 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 "Чвор"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Дијаграм развијања..."
@@ -1781,10 +1941,18 @@ msgstr "Дијаграм развијања..."
 msgid "Folder"
 msgstr "Фасцикла"
 
+#: 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 "Дијаграм случаја употребе..."
@@ -1821,6 +1989,18 @@ msgstr "Нови атрибут ентитета..."
 msgid "Export as Picture..."
 msgstr "Извези као слику..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Интерфејс"
+
+#: 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 "Дијаграм класа..."
@@ -1841,26 +2021,10 @@ msgstr "Дијаграм секвенце..."
 msgid "Collaboration Diagram..."
 msgstr "Дијаграм сарадње..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Атрибути"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Операције"
-
 #: 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 "Потпис операције"
@@ -1873,11 +2037,6 @@ msgstr "Потпис атрибута"
 msgid "Stereotype"
 msgstr "Стереотип"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Прикажи"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Атрибут..."
@@ -1902,14 +2061,6 @@ msgstr "Боја попуњавања..."
 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 "Боја"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Актер..."
@@ -1938,10 +2089,26 @@ msgstr "Набрајање..."
 msgid "Package..."
 msgstr "Пакет..."
 
+#: 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 "Стање..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Почетна активност"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Завршна активност"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Подсистем..."
@@ -1986,6 +2153,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 "Очисти дијаграм"
@@ -2020,199 +2195,104 @@ 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 "© 2001 Пол Хенсген (Paul Hensgen), © 2002-2006 аутори Umbrello-а"
 
-#: 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 "Фајл фасцикле %1 не постоји."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Фајл фасцикле %1 се не може отворити."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Топлица Танасковић"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "toptan@kde.org.yu"
-
-#: 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 "Спреман."
-
-#: 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 ""
-"Држите Shift или Ctrl за кретање дуж X-осе. Држите Shift и Ctrl за кретање дуж "
-"Y-осе. Десним кликом се прекида кретање."
-
-#: 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 ""
-"Држите Shift или Ctrl за кретање дуж X-осе. Држите Shift и Ctrl за кретање дуж "
-"Y-осе. Десним кликом се прекида промена величине."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Да ли је опсег %1 именски простор или класа?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Увоз C++-а захтева вашу помоћ"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Именски простор"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Увозим фајл: %1 Напредак: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Унутрашња грешка"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Синтаксна грешка пре „%1“"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Грешка у рашчлањивању пре „%1“"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "novi_akter"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "очекиван је израз"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "novi_slucaj_upotrebe"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Синтаксна грешка декларације"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "novi_paket"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "очекивано је }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nova_komponenta"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "очекиван је именски простор"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "novi_cvor"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "очекивано је {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "novi_artifakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Очекивано је име именског простора"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "novi_interfejs"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Потребан је спецификатор типа за декларацију"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "novi_tip_podataka"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "очекивана је декларација"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "novo_nabrajanje"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Очекиван је константан израз"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "novi_entitet"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "очекивано је „)“"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nova_fascikla"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "недостаје }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "novo_pridruzivanje"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Очекивани су иницијализатори чланова"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "novi_objekat"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Очекиван је спецификатор базне класе"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Очекивана је клаузула иницијализатора"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Празно"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Очекиван је идентификатор"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Лоше формиран аргумент"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Очекиван је ид. типа"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Непознат тип аргумента"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Очекивано је име класе"
+#: 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"
-msgstr "очекиван је услов"
+#: 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"
-msgstr "очекивана је наредба"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Неодређена грешка"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "очекивана је иницијализација for петље"
+#: 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"
-msgstr "очекивано је catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Резервисана кључна реч"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2226,106 +2306,66 @@ msgstr "Унесите име објекта:"
 msgid "new_parameter"
 msgstr "novi_parametar"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Опште опције"
-
-#: 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"
-msgstr "Дијаграм: %2 страна %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Унесите име дијаграма"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Додај базну класу"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Унесите ново име за дијаграм:"
+#: 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?"
-msgstr ""
-"Управо ћете обрисати цео дијаграм.\n"
-"Да ли сте сигурни?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Додај операцију"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Да ли да обришем дијаграм?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Додај атрибут"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Преименовање је отказано"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Додај базни интерфејс"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Преименовање ставке типа %1 у приказу листе још увек није имплементирано."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Додај изведени интерфејс"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Функција није имплементирана"
+#: 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."
-msgstr ""
-"Име које сте унели није исправно.\n"
-"Процес промене имена је отказан."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Изведени класификатори"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "novo_pridruzivanje"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Унесите име стања"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "novi_atribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Унесите име новог стања:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novi_sablon"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Унесите активност"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operacija"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Неисправно коришћење придруживања."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "novi_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Грешка придруживања"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_polje"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "ново стање"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2479,11 +2519,6 @@ msgstr "Изв&ези као слику..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Извези &све дијаграме као слике..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Својства"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Клизач &зумирања"
@@ -2568,25 +2603,32 @@ msgstr "&Документација"
 msgid "Opening file..."
 msgstr "Отварам фајл..."
 
+#: 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 "Правим нови документ..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Сви подржани фајлови (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Сви подржани фајлови (*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2, *.mdl)\n"
 "*.xmi|Распаковани XMI фајлови (*.xmi)\n"
 "*.xmi.tgz|Gzip-ом компресовани XMI фајлови (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2-ом компресовани XMI фајлови (*.xmi.tar.bz2) *.mdl|Rose-ови "
-"моделски фајлови"
+"*.xmi.tar.bz2|Bzip2-ом компресовани XMI фајлови (*.xmi.tar.bz2) *.mdl|Rose-"
+"ови моделски фајлови"
 
 #: uml.cpp:677
 msgid "Open File"
@@ -2612,6 +2654,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 компресовани XMI фајл\n"
 "*|Сви фајлови"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2620,6 +2666,10 @@ msgstr ""
 "Фајл %1 постоји.\n"
 "Желите ли да га пребришете?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Пребриши"
@@ -2655,11 +2705,11 @@ msgstr "Умећем садржај клипборда..."
 
 #: 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 ""
-"Umbrello није могао да уметне садржај клипборда. Објекти у клипборду су можда "
-"погрешног типа да би се овде уметнули."
+"Umbrello није могао да уметне садржај клипборда. Објекти у клипборду су "
+"можда погрешног типа да би се овде уметнули."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2713,1261 +2763,1309 @@ msgstr "Сви фајлови"
 msgid "Select Code to Import"
 msgstr "Одаберите кôд за увоз"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Име &класе:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Име &актера:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "novi_atribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Име &пакета:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novi_sablon"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Име случаја употребе:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operacija"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Име и&нтерфејса:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "novi_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Име &компоненте:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_polje"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Име &артифакта:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML моделар"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "И&ме набрајања:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Логички приказ"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Име типа по&датка:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Приказ случаја употребе"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "И&ме ентитета:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Приказ компоненти"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Име &стереотипа:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Приказ развијања"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Име &пакета:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Модел односа међу ентитетима"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "А&пстрактна класа"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Типови података"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Случај коришћења а&пстракције"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Текући фајл је измењен.\n"
+"Желите ли да га сачувате?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Извршно"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Фајл %1 не постоји."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Цртај као"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Фајл %1 изгледа покварено."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "По&дразумевано"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Није нађен ниједан XMI фајл у компресованом фајлу %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Библиотека"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Дошло је до проблема приликом учитавања распакованог фајла: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Табела"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Дошло је до проблема приликом учитавања фајла: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "Ја&вно"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Дошло је до проблема приликом слања фајла: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "П&риватно"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "дијаграм случаја употребе"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Заш&тићено"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "дијаграм класе"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "При&мена"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "дијаграм секвенце"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Име класе:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "дијаграм сарадње"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Име примерка:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "дијаграм стања"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Цртај као актера"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "дијаграм активности"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Вишеструки примерак"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "дијаграм компоненти"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Прикажи разграђивање"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "дијаграм развијања"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Име компоненте:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "дијаграма односа међу ентитетима"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Име чвора:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "То је неисправно име за дијаграм."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Име стереотипа:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Дијаграм већ користи то име."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Име које сте одабрали\n"
-"већ се користи.\n"
-"Име је ресетовано."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Име није јединствено"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Линија:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Попуњавање:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "П&одразумевано"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Користи попуњавање"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Активности"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Нова активност..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Промени име"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Нова активност"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Промени име активности"
+"Име које сте унели није јединствено.\n"
+"Да ли сте ово желели?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Унесите ново име за активност:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Користи име"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Својства придруживања"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+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 "Опште поставке"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Да ли сте сигурни да желите да обришете дијаграм %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Улоге"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Обриши дијаграм"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Поставке улоге"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+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 "Поставке фонта"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Разрешавам референце објекта..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Фонт придруживања"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Учитавам UML елементе..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Својства шаблона"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+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 "Опште особине"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/аутоматско снимање%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Тип:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Учини фасциклу спољном"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Име:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Унесите име модела"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Унели сте неисправно име за шаблон."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Унесите ново име модела:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Неисправно име за шаблон"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Прикази"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter 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/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Име шаблона није јединствено"
+"Име које сте унели није исправно.\n"
+"Процес прављења је отказан."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Својства атрибута ентитета"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Име није исправно"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Подразумевана вредност:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Име које сте унели није јединствено!\n"
+"Процес прављења је отказан."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Дужина/вредности:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Прављење је отказано"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Аутоматско увећање"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Учитавам приказ листе..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Дозволи &нулто"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Фасцикла се мора прво испразнити да би се обрисала."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Атрибути:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Фасцикла није празна"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Индексирање"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Преименовање је отказано"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Никакво"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Преименовање ставке типа %1 у приказу листе још увек није имплементирано."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Примарно"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Функција није имплементирана"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Индекс"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Име које сте унели није исправно.\n"
+"Процес промене имена је отказан."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Јединствено"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Дијаграм: %2 страна %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Унели сте неисправно име атрибута ентитета."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Унесите име дијаграма"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Неисправно име атрибута ентитета"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Унесите ново име за дијаграм:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Име које сте одабрали за атрибут ентитета већ се користи у овој операцији."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Име атрибута ентитета није јединствено"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Приказ"
+"Управо ћете обрисати цео дијаграм.\n"
+"Да ли сте сигурни?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Опције за приказ класа"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Да ли да обришем дијаграм?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Боје за дијаграм"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Извозим приказ..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Име које сте унели није исправно."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Дошло је до грешке при извозу слике:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Име које сте унели није јединствено."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Изабрани фајл %1 постоји.\n"
+"Желите ли да га пребришете?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Тип:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Фајл већ постоји"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Подешавање Umbrellо-а"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Не могу да направим фасциклу: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Кориснички интерфејс"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Не могу да снимим празан дијаграм"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Поставке корисничког интерфејса"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Дошло је до проблема при снимању дијаграма у %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Боја линије:"
+#: 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 ""
+"Држите Shift или Ctrl за кретање дуж X-осе. Држите Shift и Ctrl за кретање "
+"дуж Y-осе. Десним кликом се прекида кретање."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-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 ""
+"Држите Shift или Ctrl за кретање дуж X-осе. Држите Shift и Ctrl за кретање "
+"дуж Y-осе. Десним кликом се прекида промена величине."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Боја за попуњавање:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Објекат"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "По&дразумевана боја"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Синхрона порука"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Ширина линије:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Асинхрона порука"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "П&одразумевана ширина"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Ознака"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Користи боју за попуњавање"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Забелешка"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Укључи опозивање"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Кутија"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Користи дијаграме са језичцима"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Однос"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Користите нове C++/Java/Ruby генераторе"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Дирекционо придруживање"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Користи угловне линије придруживања"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Имплементира (генерализација-реализација)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Аутоматско снимање"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Далека историја"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Укључи аутоматско снимање"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Блиска историја"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Одаберите период аутоматског снимања (минута):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Споји"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Поставите суфикс аутоматског снимања:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Раздвој"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Ако нисте већ једном ручно снимили фајл, при аутоматском снимању фајл ће "
-"бити именован ~/autosave.xmi.</p>"
-"<p>Ако јесте већ једном снимили, при аутоматском снимању биће направљен фајл у "
-"истој фасцикли и истог имена, али са додатком наведеног суфикса.</p>"
-"<p>Ако је суфикс исти као суфикс фајла који сте снимили, аутоматско снимање ће "
-"пребрисати тај фајл.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Састав"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Покретање"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Избор"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Лого п&ри покретању"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Прелаз активности"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Савет дана"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Порука"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Учитај последњи пројекат"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "НЕДЕФИНИСАНО"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Почни нови пројекат:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Избор"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Без дијаграма"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Дијаграм класа"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Дијаграм случаја употребе"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Дијаграм секвенци"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Дијаграм сарадње"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Прикажи операције"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Дијаграм стања"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Дијаграм активности"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Очисти дијаграм"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Дијаграм компоненти"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Дијаграм развијања"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Уопштење"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Поставке класе"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Прикажи &видљивост"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Прикажи атрибуте"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Име придруживања"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Прикажи операције"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Пр&икажи стереотип"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Прикажи потпис атрибута"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Прикажи пакет"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "По&дразумевано"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Почетни опсег"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Подразумевани опсег атрибута:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Кроз-кроз (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Подразумевани опсег операције:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Кроз-звездица (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Генерисање кôда"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Стил:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Поставке генерисања кôда"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Генерисање C++ кôда</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Поставке приказивача кôда"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Генерисање тела метода"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Својства операција"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Користи следеће за класе у генерисаном кôду:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Апстрактна операција"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Оп&сег класификатора („static“)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Упит („const“)"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Променљива</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "З&аштићено"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "При&мена"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Параметри"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Но&ви параметар..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Знаковни низ</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Унели сте неисправно име за параметар."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Листа</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Неисправно име параметра"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Име које сте одабрали за параметар\n"
-"већ се користи у овој операцији."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>глобално?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Име параметра није јединствено"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Име које сте одабрали за параметар већ се користи у овој операцији."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Име класе"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Унели сте неисправно име операције."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<p align=\"center\">Укључни фајл</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Неисправно име операције"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Генерисање пројекта"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Операција са таквим потписом већ постоји у %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Направи градитељски ANT документ"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Изаберите другачије име или параметарску листу."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Аутоматски генериши методе"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Својства улоге „А“"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Празни конструкторски методи"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Својства улоге „B“"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Приступни методи придруживања"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Видљивост улоге „А“"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Приступни методи атрибута"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Видљивост улоге „B“"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Из родитељског објекта"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Променљивост улоге „А“"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Подразумевани опсег приступа атрибута:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Променљивост улоге „B“"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Подразумевани опсег поља придруживања:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Садржане ставке"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Из родитељске улоге"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Документација напомене"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Генерисање Java кôда</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Н&ови атрибут..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hash (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Н&ова операција..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Почетак-Крај (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Шаблони"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Генерисање Ruby кôда</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Н&ови шаблон..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Језик"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Литерали набрајања"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Фасцикле"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "Н&ови литерал набрајања..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Запиши све генерисане фајлове у фасциклу:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Атрибути ентитета"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Пре&гледај..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Н&ов атрибут ентитета..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "П&регледај..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Почетна активност"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Укључи заглавне фајлове из фасцикле:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Завршна активност"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Фајлови направљени генератором кôда биће записани у ову фасциклу"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Тип активности:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Фајлови из ове фасцикле ће бити коришћени као заглавни фајлови у генерисаном "
+"кôду"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Име активности:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Политика пребрисавања"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Боје контроле"
+#: 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 ""
+"Ако већ постоји фајл са истим именом какво \n"
+"генератор кôда хоће да користи за свој излазни фајл:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Својства атрибута"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Пре&бриши"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Почетна вредност:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Пребриши постојеће фајлове ако они постоје у одредишној фасцикли"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Јавно"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Питај"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Унели сте неисправно име атрибута."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Ако фајл са истим именом већ постоји, питај шта да радиш"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Неисправно име атрибута"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Користи другачије име"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Име које сте одабрали за атрибут већ се користи у овој операцији."
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Име атрибута није јединствено"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Форматирање"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Одаберите операцију"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Линије"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Број секвенце:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Стил краја линије:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Операција класе:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Тип увлачења:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Посебна операција:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Величина увлачења:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Дијаграми"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Филтер"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Текући дијаграм"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Сви дијаграми"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Без увлачења"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Одабери дијаграм"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Табулатор"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Тип дијаграма"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Размак"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Избор"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Опширност коментара"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Сарадња"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Пиши коментаре &за одељке иако је одељак\n"
+"празан"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Секвенца"
+#: 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Искориштење"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Пиши документацију коментара чак иако су празни"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Нема одабраних дијаграма."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Пиши коментаре &за документацију класе и метода чак иако су празни"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Опције приказа"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Опције језика"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Поставке атрибута"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Чаробњак за генерисање кôда"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Поставке операција"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Изаберите класе"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Поставке шаблона"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"У листу десно сместите све класе за\n"
+"које желите да се генерише кôд"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Поставке литерала набрајања"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Додај класу за генерисање кôда"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Поставке атрибута ентитета"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Изабране класе"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Поставке садржаја"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Уклони класу из генерисања кôда"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Придруживања"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Доступне класе"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Придружења класа"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Статус генерисања кôда"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "О&перације"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Притисните дугме за генерисање за почетак генерисања кôда"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Видљивост"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Статус генерисања"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Потпис о&перације"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Прикажи скривене блокове"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Па&кет"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">овде иде име компоненте</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Ат&рибути"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Стереот&ип"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Прикажи тип блока"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Потпис атр&ибута"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Боје"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Цртај као круг"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Фонт:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Почетно стање"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Папир:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Завршно стање"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Изабрано:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Тип стања:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML блок објекта:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Име стања:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Скривени блок:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Боја контроле"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Неизменљив текст:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_klasa"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Уредив текст:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Нова класа"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Својства дијаграма"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Атрибути класе"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Увеличавање:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Операције класе"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Својства параметра"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Прикажи &мрежу"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Правац проласка"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Уклапај уз мрежу"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Величина компоненте уклапања"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"„in“ је параметар само за читање, „out“ је параметар само за уписивање, а "
-"„inout“ је параметар и за читање и за уписивање."
+"Поставља величину компоненте тако да она буде умножак размака у мрежи.\n"
+"Ако је укључена опција „уклапај уз мрежу“ компонента ће увек бити поравната "
+"са мрежом на све четири стране."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Генериши"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Размак у мрежи:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Завршетак"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Кôд је генерисан"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Није генерисан"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Ширина линија:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Још увек није генерисан"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Извези све приказе"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Фасцикла %1 не постоји. Желите ли да је направите сада?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Фасцикла у којој се снимају дијаграми:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Излазна фасцикла не постоји"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Основна фасцикла за снимање слика"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Направи фасциклу"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Тип слике:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Не прави"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Користи &фасцикле"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Фасцикла се не може направити.\n"
-"Проверите да ли имате право уписа у њену родитељску фасциклу или изаберите "
-"другу, исправану, фасциклу."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Грешка при прављењу фасцикле"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Изаберите исправну фасциклу."
+"Направи у циљној фасцикли исту структуру стабла каква се\n"
+"користи у документу за складиштење приказа"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Излазна фасцикла постоји, али се у њу не може писати.\n"
-"Поставите одговарајуће дозволе или изаберите другу фасциклу."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Грешка при писању у излазну фасциклу"
+"Прикази се држе у фасциклама у документу. Иста структура стабла која се "
+"користи у документу може бити направљена у изабраној основној фасцикли на "
+"диску.\n"
+"Само фасцикле које је направио корисник праве се у основној фасцикли "
+"(логички приказ, прикази случајева употребе, и слични, не праве се)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 не изгледа као фасцикла. Изаберите исправну фасциклу."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Изменљивост улоге"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Изаберите исправну фасциклу"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Видљивост улоге"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Одредишни фајл већ постоји"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Фајл %1 већ постоји у %2.\n"
-"\n"
-"Umbrello може да пребрише фајл, направи фајл\n"
-"сличног имена или да га уопше и не направи."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Примени на све преостале фајлове"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Пребриши"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Направи слично име фајла"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Не&мој да правиш фајл"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Нема доступних опција.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Вишеструкост"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Унесите вишеструкост:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Име придруживања"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Унесите име придруживања:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Име улоге"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Унесите име улоге:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Унесите име операције:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Унесите нови текст:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ГРЕШКА"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Измени текст"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Поравнај лево"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Поравнај десно"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Дијаграм"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Поравнај на врху"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Нови"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Поравнај на дну"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Пр&икажи"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Поравнај усправно у средини"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Увеличавање:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Поравнај водоравно у средини"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Кôд"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Поравнај усправно распоређено"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Активни &језик"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Поравнај водоравно распоређено"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"За поравнање морате изабрати бар два објекта као класе или актере. Не можете "
-"поравнати придруживања."
+"<p>Добродошли у Umbrello.</p>\n"
+"<p>Помоћу UML дијаграма можете дизајнирати и документисати објектно "
+"оријентисани софтвер.  <a href=\"help:/umbrello\">Приручник за Umbrello</a> "
+"је добар увод у коришћење UML-а.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Ово је резервисана кључна реч за језик подешеног генератора кôда."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Резервисана кључна реч"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Извозим приказ..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Добродошли у  Umbrello 1.5.  Ново у овој верзији су класе придруживања, "
+"генерација Ruby кода, екстернализација фасцикли, могућност претварања "
+"интерфејса у класе и још много тога.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Дошло је до грешке при извозу слике:\n"
+"<p>Дијаграми са језичцима и Спољне фасцикле се међусобно искључују. Ако вам "
+"требају Спољне фасцикле онда демаркирајте &quot;Користи дијаграме са "
+"језичцима&quot; у општим подешавањима.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Изабрани фајл %1 постоји.\n"
-"Желите ли да га пребришете?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Фајл већ постоји"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "novi_akter"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "novi_slucaj_upotrebe"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "novi_paket"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nova_komponenta"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "novi_cvor"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "novi_artifakt"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "novi_interfejs"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "novi_tip_podataka"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "novo_nabrajanje"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "novi_entitet"
+"<p>Већини дијаграмских ставки не може да се промени величина, већ ће то "
+"учинити саме да би се прилагодиле свом садржају.\n"
+"Кутијама, белешкама и порукама дијаграма секвенце величина може бити "
+"промењена кликом на и повлачењем црвеног квадрата.</p>\n"
 
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nova_fascikla"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "novi_objekat"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Празно"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Лоше формиран аргумент"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Непознат тип аргумента"
+#: 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 ""
+"<p>Ако желите у дијаграм да додате класу која већ постоји, само превуците "
+"њен унос из стаблоликог приказа.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Недозвољено име метода"
+#: 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 ""
+"<p>Umbrello-ов рефакторизациони агент вам омогућава да премештате операције "
+"између класе и њених изведених и базних класа.\n"
+"Десно кликните на класу да бисте отворили рефакторизациони агент.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Непознат повратни тип"
+#: 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 ""
+"<p>Објекти дијаграма секвенце могу имати кућицу за разграђивање и бити "
+"нацртани као актери. Двокликните на неки за дијалог са својствима.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Неодређена грешка"
+#: 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 ""
+"<p>Поруке дијаграма секвенце могу имати улогу конструктора. Кликните на "
+"кутију објекта (уместо на усправну линију) да је учините конструктором.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Додај базну класу"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Дијаграми секвенце подржавају поруке за саме себе. Кликните поново на "
+"исту усправну линију да направите аутопоруку.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Додај изведену класу"
+#: 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 ""
+"<p>Ако се по учитавању страног фајла ништа не појави у приказу листе, "
+"покушајте да снимите модел под другим именом, затворите, и поново учитате "
+"снимљени фајл. Обично ће тада приказ листе бити исправно попуњен.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Додај операцију"
+#: 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 ""
+"<p>Исеци и копирај ће такође извести слику у PNG клипборд, одакле може бити "
+"уметнута у KWord и друге програме.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Додај атрибут"
+#: 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 ""
+"<p>Придруживања не морају да буду у правим линијама, двоклик на неку ће "
+"направити померљиву тачку.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Додај базни интерфејс"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Аутоматско снимање можете укључити у дијалогу за подешавање Umbrello-а.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Додај изведени интерфејс"
+#: 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 ""
+"<p>Да ли Umbrello нема неку могућност која вам треба? Ако је тако, "
+"обавестите нас.\n"
+"Или је додајте у базу података о грешкама помоћу пријаве грешака из менија "
+"Помоћ, или нам је пошаљите на досписну листу uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Базни класификатори"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Све изабране објекте можете обрисати притиском на Del или Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Изведени класификатори"
+#: 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 ""
+"<p>Ако сте нашли грешку у Umbrello-у, обавестите нас.\n"
+"Грешке можете послати алатом за пријаву грешака из менија Помоћ.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Не могу да направим фасциклу: %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 ""
+"<p>Притиском на тастер Escape поставља се текући алат на изабрани алат.\n"
+"Backspace-ом се скаче на претходно коришћени алат.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Не могу да снимим празан дијаграм"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Можете изабрати све објекте притиском на Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Дошло је до проблема при снимању дијаграма у %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 ""
+"<p>Можете направити и подесити нову класу користећи чаробњака из менија Кôд."
+"</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "novi_stereotip"
diff --git a/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po b/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po
index e68a75b4b86..71c8b81cea6 100644
--- a/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po
+++ b/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-10-01 13:46+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -20,246 +20,207 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello-ov generator autonomnog koda"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "fajl za transformisanje"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "XSLT fajl koji treba upotrebiti"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "© 2006 Gael de Chalendar (tpk. Kleag), © 2002-2006 autori Umbrello-a"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autori Umbrello-a, UML modelara"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Toplica Tanasković"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Izvozim sve prikaze..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "toptan@kde.org.yu"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Došlo je do nekih grešaka pri izvozu slika:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Unesite ime za aktivnost"
 
-#: 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 "Došlo je do problema prilikom snimanja fajla: %1"
+#: 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 "Unesite ime za novu aktivnost:"
 
-#: 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 "Greška pri snimanju"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Poravnaj levo"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekat"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Poravnaj desno"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Sinhrona poruka"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Poravnaj na vrhu"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asinhrona poruka"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Poravnaj na dnu"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Pridruživanje"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Poravnaj uspravno u sredini"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Sadržalac"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Poravnaj vodoravno u sredini"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Sidro"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Poravnaj uspravno raspoređeno"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Oznaka"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Poravnaj vodoravno raspoređeno"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Zabeleška"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"Za poravnanje morate izabrati bar dva objekta kao klase ili aktere. Ne "
+"možete poravnati pridruživanja."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kutija"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatiranje"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Akter"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Zavisnost"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Uopštenje"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Agregacija"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Odnos"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Direkciono pridruživanje"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementira (generalizacija-realizacija)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompozicija"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Slučaj upotrebe"
-
-#. 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 "Klasa"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Početno stanje"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Završno stanje"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Granaj/Stopi"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Podeli/Spoji"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponenta"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Čvor"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Zavisnost"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artifakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Pridruživanje"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfejs"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Samopridruživanje"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tip podataka"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Poruka o saradnji"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Nabrajanje"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Poruka o sekvenci"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entitet"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Poruka o samosaradnji"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Daleka istorija"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Poruka o samosekvenci"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Bliska istorija"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Sadržalac"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Spoji"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompozicija"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Razdvoj"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizacija"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Sastav"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Jednostrano pridruživanje"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Izbor"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Sidro"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Prelaz stanja"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Prelaz aktivnosti"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktivnost"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stanje"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Višestrukost"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Završna aktivnost"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Unesite višestrukost:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Početna aktivnost"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Ime pridruživanja"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Poruka"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Unesite ime pridruživanja:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "NEDEFINISANO"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Ime uloge"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Izbor"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Unesite ime uloge:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"Operacija sa istim imenom i potpisom već postoji. Ne možete je ponovo dodati."
+
+#: 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 "To ime nije ispravno."
+
+#: 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 "Neispravno ime"
+
+#: 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 "To ime se već koristi."
+
+#: 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 "Nije jedinstveno ime"
 
 #: 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."
+"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 ""
-"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato što stavka sa istim "
-"imenom već postoji. Sve ostale stavke su umetnute."
+"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato što stavka sa "
+"istim imenom već postoji. Sve ostale stavke su umetnute."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -270,18 +231,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Ne mogu da otvorim fajl %1 za upis. Uverite se da fascikla postoji i da imate "
-"pravo upisa u nju."
+"Ne mogu da otvorim fajl %1 za upis. Uverite se da fascikla postoji i da "
+"imate pravo upisa u nju."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Ne mogu da otvorim fajl"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ne mogu da napravim fasciklu:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ne mogu da napravim fasciklu:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1345 +254,1517 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Ne mogu da napravim fasciklu"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Unesite ime stanja"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Opšte opcije"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Unesite ime novog stanja:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paket je imenski prostor"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Unesite aktivnost"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuelni razgrađivač"
 
-#: 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 "Unesite ime za novu aktivnost:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generiši prazne konstrusktore"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "nova aktivnost"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generiši pristupne metode"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML modelar"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operacije su u liniji"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logički prikaz"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Pristupači su u liniji"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Prikaz slučaja upotrebe"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Pristupači su javni"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Prikaz komponenti"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Uvozim fajl: %1 Napredak: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Prikaz razvijanja"
+#: 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 "Spreman."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model odnosa među entitetima"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Da li je opseg %1 imenski prostor ili klasa?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipovi podataka"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Uvoz C++-a zahteva vašu pomoć"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Tekući fajl je izmenjen.\n"
-"Želite li da ga sačuvate?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Imenski prostor"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Fajl %1 ne postoji."
+#: 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 "Klasa"
 
-#: 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 "Greška pri učitavanju"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Unutrašnja greška"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Fajl %1 izgleda pokvareno."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Sintaksna greška pre „%1“"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Nije nađen nijedan XMI fajl u kompresovanom fajlu %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Greška u raščlanjivanju pre „%1“"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Došlo je do problema prilikom učitavanja raspakovanog fajla: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Došlo je do problema prilikom učitavanja fajla: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "očekivan je izraz"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Došlo je do problema prilikom slanja fajla: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Sintaksna greška deklaracije"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "dijagram slučaja upotrebe"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "očekivano je }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "dijagram klase"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "očekivan je imenski prostor"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "dijagram sekvence"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "očekivano je {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "dijagram saradnje"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Očekivano je ime imenskog prostora"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "dijagram stanja"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Potreban je specifikator tipa za deklaraciju"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "dijagram aktivnosti"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "očekivana je deklaracija"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "dijagram komponenti"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Očekivan je konstantan izraz"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "dijagram razvijanja"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "očekivano je „)“"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "dijagrama odnosa među entitetima"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "nedostaje }"
 
-#: 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 "Ime"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Očekivani su inicijalizatori članova"
 
-#: 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 "Unesite ime:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Očekivan je specifikator bazne klase"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "To je neispravno ime za dijagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Očekivana je klauzula inicijalizatora"
 
-#: 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 "Neispravno ime"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Očekivan je identifikator"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Dijagram već koristi to ime."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Očekivan je id. tipa"
 
-#: 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 "Nije jedinstveno ime"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Očekivano je ime klase"
 
-#: 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 "To ime nije ispravno."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "očekivan je uslov"
 
-#: 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 "To ime se već koristi."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "očekivana je naredba"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Ime koje ste uneli nije jedinstveno.\n"
-"Da li ste ovo želeli?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "očekivana je inicijalizacija for petlje"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Ime nije jedinstveno"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "očekivano je catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Koristi ime"
+#: 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 "&Svojstva"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Unesite novo ime"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Početna aktivnost"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Da li ste sigurni da želite da obrišete dijagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Završna aktivnost"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Obriši dijagram"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Granaj/Stopi"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Postavljam dokument..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Podeli/Spoji"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Razrešavam reference objekta..."
+#: 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 "Opšte"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Učitavam UML elemente..."
+#: 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 "Opšte osobine"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Učitavam dijagrame..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tip aktivnosti:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-dijagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ime aktivnosti:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/automatsko snimanje%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 "Dokumentacija"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Učini fasciklu spoljnom"
+#: 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 "Font:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Unesite ime modela"
+#: 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 "Postavke fonta"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Unesite novo ime modela:"
+#: 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 "Boja"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Prikazi"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Boje kontrole"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Ime koje ste uneli nije ispravno.\n"
-"Proces pravljenja je otkazan."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivnosti"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ime nije ispravno"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nova aktivnost..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Ime koje ste uneli nije jedinstveno!\n"
-"Proces pravljenja je otkazan."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Obriši sidro"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Pravljenje je otkazano"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Promeni ime"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Učitavam prikaz liste..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nova aktivnost"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Fascikla se mora prvo isprazniti da bi se obrisala."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "nova aktivnost"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Fascikla nije prazna"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Promeni ime aktivnosti"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Operacija sa istim imenom i potpisom već postoji. Ne možete je ponovo dodati."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Unesite ime za aktivnost"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "novo stanje"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tip:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Uopštenje"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Pridruživanja"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Samopridruživanje"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Svojstva pridruživanja"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Poruka o saradnji"
+#: 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 "Opšte postavke"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Poruka o sekvenci"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Uloge"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Poruka o samosaradnji"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Postavke uloge"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Poruka o samosekvenci"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Font pridruživanja"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizacija"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Svojstva uloge „A“"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Jednostrano pridruživanje"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Svojstva uloge „B“"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Izvezi"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Vidljivost uloge „A“"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Dijagram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Vidljivost uloge „B“"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Novi"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Promenljivost uloge „A“"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "Pr&ikaži"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Promenljivost uloge „B“"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kôd"
+msgid "Rolename:"
+msgstr "Ime uloge:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktivni &jezik"
+msgid "Multiplicity:"
+msgstr "Višestrukost:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentacija"
+msgid "Public"
+msgstr "Javni"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Kroz-kroz (//)"
+msgid "Private"
+msgstr "Privatni"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Kroz-zvezdica (/**  */)"
+msgid "Protected"
+msgstr "Zaštićeni"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+msgid "Implementation"
+msgstr "Primena"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Generisanje C++ kôda</p>"
+msgid "Changeable"
+msgstr "Izmenjivo"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Opšte"
+msgid "Frozen"
+msgstr "Zamrznuto"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Generisanje tela metoda"
+msgid "Add only"
+msgstr "Dodaj samo"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Koristi sledeće za klase u generisanom kôdu:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Ime &klase:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Ime &aktera:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Ime &paketa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Promenljiva</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Ime slučaja upotrebe:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Ime i&nterfejsa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Ime &komponente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Ime &artifakta:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Znakovni niz</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "I&me nabrajanja:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Ime tipa po&datka:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "I&me entiteta:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globalno?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Ime &stereotipa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Ime &paketa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Ime klase"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&pstraktna klasa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<p align=\"center\">Uključni fajl</p>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Slučaj korišćenja a&pstrakcije"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Generisanje projekta"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Izvršno"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Napravi graditeljski ANT dokument"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Crtaj kao"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Automatski generiši metode"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Po&drazumevano"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Prazni konstruktorski metodi"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Popunjavanje:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Pristupni metodi pridruživanja"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Biblioteka"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Pristupni metodi atributa"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabela"
 
-#. 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 "Javni"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Vidljivost"
 
-#. 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 "Privatni"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "Ja&vno"
 
-#. 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 "Zaštićeni"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivatno"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Iz roditeljskog objekta"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Zaš&tićeno"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Podrazumevani opseg pristupa atributa:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Pri&mena"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Podrazumevani opseg polja pridruživanja:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Ime klase:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Iz roditeljske uloge"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Ime primerka:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generisanje Java kôda</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Crtaj kao aktera"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Hash (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Višestruki primerak"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Početak-Kraj (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Prikaži razgrađivanje"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generisanje Ruby kôda</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Ime komponente:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Ime čvora:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Ime stereotipa:"
+
+#: 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 ""
+"Ime koje ste odabrali\n"
+"već se koristi.\n"
+"Ime je resetovano."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Ime nije jedinstveno"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributi"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ovi atribut..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacije"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&ova operacija..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Šabloni"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&ovi šablon..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Literali nabrajanja"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ovi literal nabrajanja..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributi entiteta"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ov atribut entiteta..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Obriši sidro"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Svojstva"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Prikaži"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "O&peracije"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Vidljivost"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Potpis o&peracije"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributi"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&ip"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Potpis atr&ibuta"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Crtaj kao krug"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Prikaz"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opcije prikaza"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Postavke atributa"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Postavke operacija"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Postavke šablona"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Postavke literala nabrajanja"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Postavke atributa entiteta"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Sadržalac"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Postavke sadržaja"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Pridruženja klasa"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_klasa"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nova klasa"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributi klase"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operacije klase"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Opcije za generisanje kôda"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generiši"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Fascikle"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Završetak"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Zapiši sve generisane fajlove u fasciklu:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kôd je generisan"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Pre&gledaj..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Nije generisan"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "P&regledaj..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Još uvek nije generisan"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Uključi zaglavne fajlove iz fascikle:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Fascikla %1 ne postoji. Želite li da je napravite sada?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Fajlovi napravljeni generatorom kôda biće zapisani u ovu fasciklu"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Izlazna fascikla ne postoji"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Napravi fasciklu"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ne pravi"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Fajlovi iz ove fascikle će biti korišćeni kao zaglavni fajlovi u generisanom "
-"kôdu"
+"Fascikla se ne može napraviti.\n"
+"Proverite da li imate pravo upisa u njenu roditeljsku fasciklu ili izaberite "
+"drugu, ispravanu, fasciklu."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Politika prebrisavanja"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Greška pri pravljenju fascikle"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Izaberite ispravnu fasciklu."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Ako već postoji fajl sa istim imenom kakvo \n"
-"generator kôda hoće da koristi za svoj izlazni fajl:"
+"Izlazna fascikla postoji, ali se u nju ne može pisati.\n"
+"Postavite odgovarajuće dozvole ili izaberite drugu fasciklu."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Pre&briši"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Greška pri pisanju u izlaznu fasciklu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Prebriši postojeće fajlove ako oni postoje u odredišnoj fascikli"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 ne izgleda kao fascikla. Izaberite ispravnu fasciklu."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Pitaj"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Izaberite ispravnu fasciklu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Ako fajl sa istim imenom već postoji, pitaj šta da radiš"
+msgid "Code Viewer"
+msgstr "Prikazivač koda"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Koristi drugačije ime"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Ako fajl već postoji u odredišnoj fascikli, izaberi drugo ime dodavanjem "
-"sufiksa na ime fajla"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Dijagrami"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatiranje"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linije"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Tekući dijagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Stil kraja linije:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Svi dijagrami"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Tip uvlačenja:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Odaberi dijagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Veličina uvlačenja:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tip dijagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Izbor"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Slučaj upotrebe"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Saradnja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Bez uvlačenja"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvenca"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulator"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Razmak"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Opširnost komentara"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Iskorištenje"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-dijagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Nema odabranih dijagrama."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Format u kojem će slike biti izvezene"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Dokumentacija napomene"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Odredišni fajl već postoji"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Piši komentare &za odeljke iako je odeljak\n"
-"prazan"
+"Fajl %1 već postoji u %2.\n"
+"\n"
+"Umbrello može da prebriše fajl, napravi fajl\n"
+"sličnog imena ili da ga uopše i ne napravi."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Primeni na sve preostale fajlove"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Prebriši"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Napravi slično ime fajla"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Ne&moj da praviš fajl"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Svojstva parametra"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tip:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Ime:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Početna vrednost:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Pravac prolaska"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Piše komentare za naznaku drugog odeljka (javni, privatni itd.) u klasi, čak i "
-"ako su odeljci prazni"
+"„in“ je parametar samo za čitanje, „out“ je parametar samo za upisivanje, a "
+"„inout“ je parametar i za čitanje i za upisivanje."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Piši dokumentaciju komentara čak iako su prazni"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Sadržane stavke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Piši komentare &za dokumentaciju klase i metoda čak iako su prazni"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Odaberite operaciju"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Opcije jezika"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Broj sekvence:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Čarobnjak za generisanje kôda"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operacija klase:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Izaberite klase"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Posebna operacija:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Podešavanje Umbrello-a"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Korisnički interfejs"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Postavke korisničkog interfejsa"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Boja linije:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Po&drazumevana boja"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Boja za popunjavanje:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Po&drazumevana boja"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Širina linije:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "P&odrazumevana širina"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Koristi boju za popunjavanje"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"U listu desno smestite sve klase za\n"
-"koje želite da se generiše kôd"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Dodaj klasu za generisanje kôda"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Uključi opozivanje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Izabrane klase"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Koristi dijagrame sa jezičcima"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Ukloni klasu iz generisanja kôda"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Koristite nove C++/Java/Ruby generatore"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Dostupne klase"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Koristi uglovne linije pridruživanja"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Status generisanja kôda"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatsko snimanje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Pritisnite dugme za generisanje za početak generisanja kôda"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Uključi automatsko snimanje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Status generisanja"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Odaberite period automatskog snimanja (minuta):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Prikazivač koda"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Postavite sufiks automatskog snimanja:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Prikaži skrivene blokove"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Ako niste već jednom ručno snimili fajl, pri automatskom snimanju "
+"fajl će biti imenovan ~/autosave.xmi.</p><p>Ako jeste već jednom snimili, "
+"pri automatskom snimanju biće napravljen fajl u istoj fascikli i istog "
+"imena, ali sa dodatkom navedenog sufiksa.</p><p>Ako je sufiks isti kao "
+"sufiks fajla koji ste snimili, automatsko snimanje će prebrisati taj fajl.</"
+"p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">ovde ide ime komponente</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Pokretanje"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Prikaži tip bloka"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logo p&ri pokretanju"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Boje"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Savet dana"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Font:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Učitaj poslednji projekat"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papir:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Počni novi projekat:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Izabrano:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Bez dijagrama"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML blok objekta:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Dijagram klasa"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skriveni blok:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Dijagram slučaja upotrebe"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Neizmenljiv tekst:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Dijagram sekvenci"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Urediv tekst:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Dijagram saradnje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Svojstva dijagrama"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Dijagram stanja"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ime:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Dijagram aktivnosti"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Uveličavanje:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Dijagram komponenti"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Dijagram razvijanja"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Postavke klase"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Prikaži &vidljivost"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Prikaži atribute"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Prikaži operacije"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Pr&ikaži stereotip"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Prikaži potpis atributa"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Prikaži paket"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Prikaži potpis operacije"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Prikaži &mrežu"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Početni opseg"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Uklapaj uz mrežu"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Podrazumevani opseg atributa:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Veličina komponente uklapanja"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Podrazumevani opseg operacije:"
 
-#. 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."
-msgstr ""
-"Postavlja veličinu komponente tako da ona bude umnožak razmaka u mreži.\n"
-"Ako je uključena opcija „uklapaj uz mrežu“ komponenta će uvek biti poravnata sa "
-"mrežom na sve četiri strane."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generisanje kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Razmak u mreži:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Postavke generisanja kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Postavke prikazivača kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Početno stanje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Širina linija:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Završno stanje"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Izvezi sve prikaze"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tip stanja:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Fascikla u kojoj se snimaju dijagrami:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Ime stanja:"
 
-#. 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"
-msgstr "Osnovna fascikla za snimanje slika"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Boja kontrole"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "&Tip slike:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Svojstva atributa"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Format u kojem će slike biti izvezene"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Op&seg klasifikatora („static“)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Koristi &fascikle"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Javno"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Napravi u ciljnoj fascikli istu strukturu stabla kakva se\n"
-"koristi u dokumentu za skladištenje prikaza"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Z&aštićeno"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "Pri&mena"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Uneli ste neispravno ime atributa."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Neispravno ime atributa"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Prikazi se drže u fasciklama u dokumentu. Ista struktura stabla koja se koristi "
-"u dokumentu može biti napravljena u izabranoj osnovnoj fascikli na disku.\n"
-"Samo fascikle koje je napravio korisnik prave se u osnovnoj fascikli (logički "
-"prikaz, prikazi slučajeva upotrebe, i slični, ne prave se)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Svojstva uloge"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Ime atributa nije jedinstveno"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Ime uloge:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Svojstva atributa entiteta"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Višestrukost:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Podrazumevana vrednost:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Izmenljivost uloge"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Dužina/vrednosti:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Dodaj samo"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automatsko uvećanje"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zamrznuto"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Dozvoli &nulto"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Izmenjivo"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributi:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Vidljivost uloge"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksiranje"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Primena"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Nikakvo"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Dobrodošli u Umbrello.</p>\n"
-"<p>Pomoću UML dijagrama možete dizajnirati i dokumentisati objektno "
-"orijentisani softver.  <a href=\"help:/umbrello\">Priručnik za Umbrello</a> "
-"je dobar uvod u korišćenje UML-a.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primarno"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Dobrodošli u  Umbrello 1.5.  Novo u ovoj verziji su klase pridruživanja, "
-"generacija Ruby koda, eksternalizacija fascikli, mogućnost pretvaranja "
-"interfejsa u klase i još mnogo toga.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Dijagrami sa jezičcima i Spoljne fascikle se međusobno isključuju. Ako vam "
-"trebaju Spoljne fascikle onda demarkirajte &quot;Koristi dijagrame sa "
-"jezičcima&quot; u opštim podešavanjima.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Jedinstveno"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Većini dijagramskih stavki ne može da se promeni veličina, već će to učiniti "
-"same da bi se prilagodile svom sadržaju.\n"
-"Kutijama, beleškama i porukama dijagrama sekvence veličina može biti promenjena "
-"klikom na i povlačenjem crvenog kvadrata.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Uneli ste neispravno ime atributa entiteta."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Ako želite u dijagram da dodate klasu koja već postoji, samo prevucite njen "
-"unos iz stablolikog prikaza.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Neispravno ime atributa entiteta"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Umbrello-ov refaktorizacioni agent vam omogućava da premeštate operacije "
-"između klase i njenih izvedenih i baznih klasa.\n"
-"Desno kliknite na klasu da biste otvorili refaktorizacioni agent.</p>\n"
+"Ime koje ste odabrali za atribut entiteta već se koristi u ovoj operaciji."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
-"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Ime atributa entiteta nije jedinstveno"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Poruke dijagrama sekvence mogu imati ulogu konstruktora. Kliknite na kutiju "
-"objekta (umesto na uspravnu liniju) da je učinite konstruktorom.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Svojstva operacija"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Dijagrami sekvence podržavaju poruke za same sebe. Kliknite ponovo na istu "
-"uspravnu liniju da napravite autoporuku.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Apstraktna operacija"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Ako se po učitavanju stranog fajla ništa ne pojavi u prikazu liste, "
-"pokušajte da snimite model pod drugim imenom, zatvorite, i ponovo učitate "
-"snimljeni fajl. Obično će tada prikaz liste biti ispravno popunjen.</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Upit („const“)"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Iseci i kopiraj će takođe izvesti sliku u PNG klipbord, odakle može biti "
-"umetnuta u KWord i druge programe.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametri"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
-"napraviti pomerljivu tačku.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&vi parametar..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Automatsko snimanje možete uključiti u dijalogu za podešavanje "
-"Umbrello-a.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Uneli ste neispravno ime za parametar."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Da li Umbrello nema neku mogućnost koja vam treba? Ako je tako, obavestite "
-"nas.\n"
-"Ili je dodajte u bazu podataka o greškama pomoću prijave grešaka iz menija "
-"Pomoć, ili nam je pošaljite na dospisnu listu uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Neispravno ime parametra"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Sve izabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
+"Ime koje ste odabrali za parametar\n"
+"već se koristi u ovoj operaciji."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Ako ste našli grešku u Umbrello-u, obavestite nas.\n"
-"Greške možete poslati alatom za prijavu grešaka iz menija Pomoć.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Ime parametra nije jedinstveno"
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Pritiskom na taster Escape postavlja se tekući alat na izabrani alat.\n"
-"Backspace-om se skače na prethodno korišćeni alat.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Uneli ste neispravno ime operacije."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Neispravno ime operacije"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operacija sa takvim potpisom već postoji u %1.\n"
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Izaberite drugačije ime ili parametarsku listu."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Svojstva uloge"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Svojstva šablona"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Uneli ste neispravno ime za šablon."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Neispravno ime za šablon"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Možete izabrati sve objekte pritiskom na Ctrl-A.</p>\n"
+"Ime koje ste odabrali za parametar šablona već se koristi u ovoj operaciji."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Ime šablona nije jedinstveno"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opcije za prikaz klasa"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Boje za dijagram"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Ime koje ste uneli nije ispravno."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Ime koje ste uneli nije jedinstveno."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Ime nije jedinstveno"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linija:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Popunjavanje:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "P&odrazumevano"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Koristi popunjavanje"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Izvozim sve prikaze..."
 
-#: tips.txt:108
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Došlo je do nekih grešaka pri izvozu slika:"
+
+#: 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 "Došlo je do problema prilikom snimanja fajla: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Greška pri snimanju"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello-ov generator autonomnog koda"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "fajl za transformisanje"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "XSLT fajl koji treba upotrebiti"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz menija "
-"Kôd.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "© 2006 Gael de Chalendar (tpk. Kleag), © 2002-2006 autori Umbrello-a"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autori Umbrello-a, UML modelara"
+
+#: 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 "Ime"
+
+#: 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 "Unesite ime:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Unesite ime operacije:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Unesite novi tekst:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "GREŠKA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Izmeni tekst"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Fajl fascikle %1 ne postoji."
+
+#: 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 "Greška pri učitavanju"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Fajl fascikle %1 se ne može otvoriti."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1687,6 +1818,10 @@ msgstr "Nova operacija..."
 msgid "Select Operation..."
 msgstr "Odaberi operaciju..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Izmeni tekst..."
@@ -1738,6 +1873,19 @@ msgstr "Novi"
 msgid "Rename..."
 msgstr "Preimenuj..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Greška prilikom umetanja"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Boja linija..."
@@ -1766,14 +1914,26 @@ msgstr "Učini fasciklu unutarnjom"
 msgid "Import Classes..."
 msgstr "Uvezi klase..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Podsistem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artifakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Dijagram komponenti..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Čvor"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Dijagram razvijanja..."
@@ -1782,10 +1942,18 @@ msgstr "Dijagram razvijanja..."
 msgid "Folder"
 msgstr "Fascikla"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entitet"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Dijagram odnosa među entitetima..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Akter"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Dijagram slučaja upotrebe..."
@@ -1822,6 +1990,18 @@ msgstr "Novi atribut entiteta..."
 msgid "Export as Picture..."
 msgstr "Izvezi kao sliku..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfejs"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tip podataka"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Nabrajanje"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Dijagram klasa..."
@@ -1842,26 +2022,10 @@ msgstr "Dijagram sekvence..."
 msgid "Collaboration Diagram..."
 msgstr "Dijagram saradnje..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributi"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacije"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Samo javno"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Vidljivost"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Potpis operacije"
@@ -1874,11 +2038,6 @@ msgstr "Potpis atributa"
 msgid "Stereotype"
 msgstr "Stereotip"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Prikaži"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribut..."
@@ -1903,14 +2062,6 @@ msgstr "Boja popunjavanja..."
 msgid "Use Fill Color"
 msgstr "Koristi boju popunjavanja"
 
-#: 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 "Boja"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Akter..."
@@ -1939,10 +2090,26 @@ msgstr "Nabrajanje..."
 msgid "Package..."
 msgstr "Paket..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Početno stanje"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Završno stanje"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stanje..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Početna aktivnost"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Završna aktivnost"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Podsistem..."
@@ -1987,6 +2154,14 @@ msgstr "Obriši sidro"
 msgid "Change Association Name..."
 msgstr "Promeni ime pridruživanja..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Očisti dijagram"
@@ -2021,8 +2196,8 @@ msgstr "fascikla fajla"
 
 #: 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 ""
 "drži u ciljnoj fascikli strukturu stabla koja se koristi za skladištenje "
 "prikaza u dokumentu"
@@ -2031,189 +2206,94 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "© 2001 Pol Hensgen (Paul Hensgen), © 2002-2006 autori Umbrello-a"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Neispravno korišćenje pridruživanja."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Greška pridruživanja"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Fajl fascikle %1 ne postoji."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Fajl fascikle %1 se ne može otvoriti."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Toplica Tanasković"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "toptan@kde.org.yu"
-
-#: 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 "Spreman."
-
-#: 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 ""
-"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
-"duž Y-ose. Desnim klikom se prekida kretanje."
-
-#: 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 ""
-"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
-"duž Y-ose. Desnim klikom se prekida promena veličine."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Da li je opseg %1 imenski prostor ili klasa?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Uvoz C++-a zahteva vašu pomoć"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Imenski prostor"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Uvozim fajl: %1 Napredak: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Unutrašnja greška"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Sintaksna greška pre „%1“"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Greška u raščlanjivanju pre „%1“"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "novi_akter"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "očekivan je izraz"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "novi_slucaj_upotrebe"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Sintaksna greška deklaracije"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "novi_paket"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "očekivano je }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nova_komponenta"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "očekivan je imenski prostor"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "novi_cvor"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "očekivano je {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "novi_artifakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Očekivano je ime imenskog prostora"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "novi_interfejs"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Potreban je specifikator tipa za deklaraciju"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "novi_tip_podataka"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "očekivana je deklaracija"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "novo_nabrajanje"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Očekivan je konstantan izraz"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "novi_entitet"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "očekivano je „)“"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nova_fascikla"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "nedostaje }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "novo_pridruzivanje"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Očekivani su inicijalizatori članova"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "novi_objekat"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Očekivan je specifikator bazne klase"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Očekivana je klauzula inicijalizatora"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Prazno"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Očekivan je identifikator"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Loše formiran argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Očekivan je id. tipa"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Nepoznat tip argumenta"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Očekivano je ime klase"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nedozvoljeno ime metoda"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "očekivan je uslov"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Nepoznat povratni tip"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "očekivana je naredba"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Neodređena greška"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "očekivana je inicijalizacija for petlje"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Ovo je rezervisana ključna reč za jezik podešenog generatora kôda."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "očekivano je catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Rezervisana ključna reč"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2227,106 +2307,66 @@ msgstr "Unesite ime objekta:"
 msgid "new_parameter"
 msgstr "novi_parametar"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Opšte opcije"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paket je imenski prostor"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuelni razgrađivač"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generiši prazne konstrusktore"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generiši pristupne metode"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operacije su u liniji"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Pristupači su u liniji"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Pristupači su javni"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Dijagram: %2 strana %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Unesite ime dijagrama"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Dodaj baznu klasu"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Unesite novo ime za dijagram:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Dodaj izvedenu klasu"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Upravo ćete obrisati ceo dijagram.\n"
-"Da li ste sigurni?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Dodaj operaciju"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Da li da obrišem dijagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Dodaj atribut"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Preimenovanje je otkazano"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Dodaj bazni interfejs"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Preimenovanje stavke tipa %1 u prikazu liste još uvek nije implementirano."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Dodaj izvedeni interfejs"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkcija nije implementirana"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Bazni klasifikatori"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Ime koje ste uneli nije ispravno.\n"
-"Proces promene imena je otkazan."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Izvedeni klasifikatori"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "novo_pridruzivanje"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Unesite ime stanja"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "novi_atribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Unesite ime novog stanja:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novi_sablon"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Unesite aktivnost"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operacija"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Neispravno korišćenje pridruživanja."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "novi_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Greška pridruživanja"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_polje"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "novo stanje"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2480,11 +2520,6 @@ msgstr "Izv&ezi kao sliku..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Izvezi &sve dijagrame kao slike..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Svojstva"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Klizač &zumiranja"
@@ -2569,25 +2604,32 @@ msgstr "&Dokumentacija"
 msgid "Opening file..."
 msgstr "Otvaram fajl..."
 
+#: 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 "Pravim novi dokument..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Svi podržani fajlovi (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Svi podržani fajlovi (*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2, *.mdl)\n"
 "*.xmi|Raspakovani XMI fajlovi (*.xmi)\n"
 "*.xmi.tgz|Gzip-om kompresovani XMI fajlovi (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2-om kompresovani XMI fajlovi (*.xmi.tar.bz2) *.mdl|Rose-ovi "
-"modelski fajlovi"
+"*.xmi.tar.bz2|Bzip2-om kompresovani XMI fajlovi (*.xmi.tar.bz2) *.mdl|Rose-"
+"ovi modelski fajlovi"
 
 #: uml.cpp:677
 msgid "Open File"
@@ -2613,6 +2655,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 kompresovani XMI fajl\n"
 "*|Svi fajlovi"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2621,6 +2667,10 @@ msgstr ""
 "Fajl %1 postoji.\n"
 "Želite li da ga prebrišete?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Prebriši"
@@ -2656,11 +2706,11 @@ msgstr "Umećem sadržaj klipborda..."
 
 #: 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 ""
-"Umbrello nije mogao da umetne sadržaj klipborda. Objekti u klipbordu su možda "
-"pogrešnog tipa da bi se ovde umetnuli."
+"Umbrello nije mogao da umetne sadržaj klipborda. Objekti u klipbordu su "
+"možda pogrešnog tipa da bi se ovde umetnuli."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2714,1261 +2764,1309 @@ msgstr "Svi fajlovi"
 msgid "Select Code to Import"
 msgstr "Odaberite kôd za uvoz"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Ime &klase:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Ime &aktera:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "novi_atribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Ime &paketa:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novi_sablon"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Ime slučaja upotrebe:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operacija"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Ime i&nterfejsa:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "novi_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Ime &komponente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_polje"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Ime &artifakta:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML modelar"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "I&me nabrajanja:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logički prikaz"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Ime tipa po&datka:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Prikaz slučaja upotrebe"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "I&me entiteta:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Prikaz komponenti"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Ime &stereotipa:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Prikaz razvijanja"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Ime &paketa:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model odnosa među entitetima"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&pstraktna klasa"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipovi podataka"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Slučaj korišćenja a&pstrakcije"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Tekući fajl je izmenjen.\n"
+"Želite li da ga sačuvate?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Izvršno"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Fajl %1 ne postoji."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Crtaj kao"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Fajl %1 izgleda pokvareno."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Po&drazumevano"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Nije nađen nijedan XMI fajl u kompresovanom fajlu %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Biblioteka"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Došlo je do problema prilikom učitavanja raspakovanog fajla: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabela"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Došlo je do problema prilikom učitavanja fajla: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "Ja&vno"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Došlo je do problema prilikom slanja fajla: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivatno"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "dijagram slučaja upotrebe"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Zaš&tićeno"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "dijagram klase"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Pri&mena"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "dijagram sekvence"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Ime klase:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "dijagram saradnje"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Ime primerka:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "dijagram stanja"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Crtaj kao aktera"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "dijagram aktivnosti"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Višestruki primerak"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "dijagram komponenti"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Prikaži razgrađivanje"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "dijagram razvijanja"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Ime komponente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "dijagrama odnosa među entitetima"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Ime čvora:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "To je neispravno ime za dijagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Ime stereotipa:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Dijagram već koristi to ime."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Ime koje ste odabrali\n"
-"već se koristi.\n"
-"Ime je resetovano."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Ime nije jedinstveno"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linija:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Popunjavanje:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "P&odrazumevano"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Koristi popunjavanje"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivnosti"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nova aktivnost..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Promeni ime"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nova aktivnost"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Promeni ime aktivnosti"
+"Ime koje ste uneli nije jedinstveno.\n"
+"Da li ste ovo želeli?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Unesite novo ime za aktivnost:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Koristi ime"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Svojstva pridruživanja"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Unesite novo ime"
 
-#: 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 "Opšte postavke"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Da li ste sigurni da želite da obrišete dijagram %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Uloge"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Obriši dijagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Postavke uloge"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Postavljam dokument..."
 
-#: 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 "Postavke fonta"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Razrešavam reference objekta..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Font pridruživanja"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Učitavam UML elemente..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Svojstva šablona"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Učitavam dijagrame..."
 
-#: 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 "Opšte osobine"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/automatsko snimanje%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tip:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Učini fasciklu spoljnom"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Ime:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Unesite ime modela"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Uneli ste neispravno ime za šablon."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Unesite novo ime modela:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Neispravno ime za šablon"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Prikazi"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"Ime koje ste odabrali za parametar šablona već se koristi u ovoj operaciji."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Ime šablona nije jedinstveno"
+"Ime koje ste uneli nije ispravno.\n"
+"Proces pravljenja je otkazan."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Svojstva atributa entiteta"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ime nije ispravno"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Podrazumevana vrednost:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Ime koje ste uneli nije jedinstveno!\n"
+"Proces pravljenja je otkazan."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Dužina/vrednosti:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Pravljenje je otkazano"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automatsko uvećanje"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Učitavam prikaz liste..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Dozvoli &nulto"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Fascikla se mora prvo isprazniti da bi se obrisala."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributi:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Fascikla nije prazna"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksiranje"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Preimenovanje je otkazano"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Nikakvo"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Preimenovanje stavke tipa %1 u prikazu liste još uvek nije implementirano."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primarno"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkcija nije implementirana"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Ime koje ste uneli nije ispravno.\n"
+"Proces promene imena je otkazan."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Jedinstveno"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Dijagram: %2 strana %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Uneli ste neispravno ime atributa entiteta."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Unesite ime dijagrama"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Neispravno ime atributa entiteta"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Unesite novo ime za dijagram:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Ime koje ste odabrali za atribut entiteta već se koristi u ovoj operaciji."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Ime atributa entiteta nije jedinstveno"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Prikaz"
+"Upravo ćete obrisati ceo dijagram.\n"
+"Da li ste sigurni?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opcije za prikaz klasa"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Da li da obrišem dijagram?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Boje za dijagram"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Izvozim prikaz..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Ime koje ste uneli nije ispravno."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Došlo je do greške pri izvozu slike:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Ime koje ste uneli nije jedinstveno."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Izabrani fajl %1 postoji.\n"
+"Želite li da ga prebrišete?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tip:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Fajl već postoji"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Podešavanje Umbrello-a"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Ne mogu da napravim fasciklu: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Korisnički interfejs"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ne mogu da snimim prazan dijagram"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Postavke korisničkog interfejsa"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Došlo je do problema pri snimanju dijagrama u %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Boja linije:"
+#: 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 ""
+"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
+"duž Y-ose. Desnim klikom se prekida kretanje."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Po&drazumevana boja"
+#: 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 ""
+"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
+"duž Y-ose. Desnim klikom se prekida promena veličine."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Boja za popunjavanje:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekat"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Po&drazumevana boja"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Sinhrona poruka"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Širina linije:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asinhrona poruka"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "P&odrazumevana širina"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Oznaka"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Koristi boju za popunjavanje"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Zabeleška"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Uključi opozivanje"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kutija"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Koristi dijagrame sa jezičcima"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Odnos"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Koristite nove C++/Java/Ruby generatore"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Direkciono pridruživanje"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Koristi uglovne linije pridruživanja"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementira (generalizacija-realizacija)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatsko snimanje"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Daleka istorija"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Uključi automatsko snimanje"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Bliska istorija"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Odaberite period automatskog snimanja (minuta):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Spoji"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Postavite sufiks automatskog snimanja:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Razdvoj"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Ako niste već jednom ručno snimili fajl, pri automatskom snimanju fajl će "
-"biti imenovan ~/autosave.xmi.</p>"
-"<p>Ako jeste već jednom snimili, pri automatskom snimanju biće napravljen fajl "
-"u istoj fascikli i istog imena, ali sa dodatkom navedenog sufiksa.</p>"
-"<p>Ako je sufiks isti kao sufiks fajla koji ste snimili, automatsko snimanje će "
-"prebrisati taj fajl.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Sastav"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Pokretanje"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Izbor"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logo p&ri pokretanju"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Prelaz aktivnosti"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Savet dana"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Poruka"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Učitaj poslednji projekat"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "NEDEFINISANO"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Počni novi projekat:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Izbor"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Bez dijagrama"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Dijagram klasa"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Dijagram slučaja upotrebe"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Dijagram sekvenci"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Dijagram saradnje"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Prikaži operacije"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Dijagram stanja"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Dijagram aktivnosti"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Očisti dijagram"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Dijagram komponenti"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Dijagram razvijanja"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Uopštenje"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Postavke klase"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Prikaži &vidljivost"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Prikaži atribute"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Ime pridruživanja"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Prikaži operacije"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Pr&ikaži stereotip"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Prikaži potpis atributa"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Prikaži paket"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Po&drazumevano"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Početni opseg"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Podrazumevani opseg atributa:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Kroz-kroz (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Podrazumevani opseg operacije:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Kroz-zvezdica (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generisanje kôda"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Postavke generisanja kôda"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Generisanje C++ kôda</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Postavke prikazivača kôda"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Generisanje tela metoda"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Svojstva operacija"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Koristi sledeće za klase u generisanom kôdu:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Apstraktna operacija"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Op&seg klasifikatora („static“)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Upit („const“)"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Promenljiva</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Z&aštićeno"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "Pri&mena"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametri"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&vi parametar..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Znakovni niz</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Uneli ste neispravno ime za parametar."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Neispravno ime parametra"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Ime koje ste odabrali za parametar\n"
-"već se koristi u ovoj operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globalno?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Ime parametra nije jedinstveno"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Ime klase"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Uneli ste neispravno ime operacije."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<p align=\"center\">Uključni fajl</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Neispravno ime operacije"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Generisanje projekta"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Operacija sa takvim potpisom već postoji u %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Napravi graditeljski ANT dokument"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Izaberite drugačije ime ili parametarsku listu."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Automatski generiši metode"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Svojstva uloge „A“"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Prazni konstruktorski metodi"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Svojstva uloge „B“"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Pristupni metodi pridruživanja"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Vidljivost uloge „A“"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Pristupni metodi atributa"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Vidljivost uloge „B“"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Iz roditeljskog objekta"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Promenljivost uloge „A“"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Podrazumevani opseg pristupa atributa:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Promenljivost uloge „B“"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Podrazumevani opseg polja pridruživanja:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Sadržane stavke"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Iz roditeljske uloge"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Dokumentacija napomene"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generisanje Java kôda</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ovi atribut..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Hash (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ova operacija..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Početak-Kraj (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Šabloni"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generisanje Ruby kôda</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ovi šablon..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Literali nabrajanja"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Fascikle"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ovi literal nabrajanja..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Zapiši sve generisane fajlove u fasciklu:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributi entiteta"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Pre&gledaj..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ov atribut entiteta..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "P&regledaj..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Početna aktivnost"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Uključi zaglavne fajlove iz fascikle:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Završna aktivnost"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Fajlovi napravljeni generatorom kôda biće zapisani u ovu fasciklu"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tip aktivnosti:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Fajlovi iz ove fascikle će biti korišćeni kao zaglavni fajlovi u generisanom "
+"kôdu"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ime aktivnosti:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Politika prebrisavanja"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Boje kontrole"
+#: 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 ""
+"Ako već postoji fajl sa istim imenom kakvo \n"
+"generator kôda hoće da koristi za svoj izlazni fajl:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Svojstva atributa"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Pre&briši"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Početna vrednost:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Prebriši postojeće fajlove ako oni postoje u odredišnoj fascikli"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Javno"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Pitaj"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Uneli ste neispravno ime atributa."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Ako fajl sa istim imenom već postoji, pitaj šta da radiš"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Neispravno ime atributa"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Koristi drugačije ime"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Ako fajl već postoji u odredišnoj fascikli, izaberi drugo ime dodavanjem "
+"sufiksa na ime fajla"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Ime atributa nije jedinstveno"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatiranje"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Odaberite operaciju"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linije"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Broj sekvence:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Stil kraja linije:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operacija klase:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Tip uvlačenja:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Posebna operacija:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Veličina uvlačenja:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Dijagrami"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Tekući dijagram"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Svi dijagrami"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Bez uvlačenja"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Odaberi dijagram"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulator"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tip dijagrama"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Razmak"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Izbor"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Opširnost komentara"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Saradnja"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Piši komentare &za odeljke iako je odeljak\n"
+"prazan"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvenca"
+#: 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 ""
+"Piše komentare za naznaku drugog odeljka (javni, privatni itd.) u klasi, čak "
+"i ako su odeljci prazni"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Iskorištenje"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Piši dokumentaciju komentara čak iako su prazni"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Nema odabranih dijagrama."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Piši komentare &za dokumentaciju klase i metoda čak iako su prazni"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opcije prikaza"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Opcije jezika"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Postavke atributa"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Čarobnjak za generisanje kôda"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Postavke operacija"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Izaberite klase"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Postavke šablona"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"U listu desno smestite sve klase za\n"
+"koje želite da se generiše kôd"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Postavke literala nabrajanja"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Dodaj klasu za generisanje kôda"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Postavke atributa entiteta"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Izabrane klase"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Postavke sadržaja"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Ukloni klasu iz generisanja kôda"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Pridruživanja"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Dostupne klase"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Pridruženja klasa"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Status generisanja kôda"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "O&peracije"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Pritisnite dugme za generisanje za početak generisanja kôda"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Vidljivost"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Status generisanja"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Potpis o&peracije"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Prikaži skrivene blokove"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ket"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">ovde ide ime komponente</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributi"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&ip"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Prikaži tip bloka"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Potpis atr&ibuta"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Boje"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Crtaj kao krug"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Font:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Početno stanje"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papir:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Završno stanje"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Izabrano:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tip stanja:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML blok objekta:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Ime stanja:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skriveni blok:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Boja kontrole"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Neizmenljiv tekst:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_klasa"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Urediv tekst:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nova klasa"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Svojstva dijagrama"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributi klase"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Uveličavanje:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operacije klase"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Svojstva parametra"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Prikaži &mrežu"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Pravac prolaska"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Uklapaj uz mrežu"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Veličina komponente uklapanja"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"„in“ je parametar samo za čitanje, „out“ je parametar samo za upisivanje, a "
-"„inout“ je parametar i za čitanje i za upisivanje."
+"Postavlja veličinu komponente tako da ona bude umnožak razmaka u mreži.\n"
+"Ako je uključena opcija „uklapaj uz mrežu“ komponenta će uvek biti poravnata "
+"sa mrežom na sve četiri strane."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generiši"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Razmak u mreži:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Završetak"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kôd je generisan"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Nije generisan"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Širina linija:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Još uvek nije generisan"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Izvezi sve prikaze"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Fascikla %1 ne postoji. Želite li da je napravite sada?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Fascikla u kojoj se snimaju dijagrami:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Izlazna fascikla ne postoji"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Osnovna fascikla za snimanje slika"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Napravi fasciklu"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "&Tip slike:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ne pravi"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Koristi &fascikle"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Fascikla se ne može napraviti.\n"
-"Proverite da li imate pravo upisa u njenu roditeljsku fasciklu ili izaberite "
-"drugu, ispravanu, fasciklu."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Greška pri pravljenju fascikle"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Izaberite ispravnu fasciklu."
+"Napravi u ciljnoj fascikli istu strukturu stabla kakva se\n"
+"koristi u dokumentu za skladištenje prikaza"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Izlazna fascikla postoji, ali se u nju ne može pisati.\n"
-"Postavite odgovarajuće dozvole ili izaberite drugu fasciklu."
+"Prikazi se drže u fasciklama u dokumentu. Ista struktura stabla koja se "
+"koristi u dokumentu može biti napravljena u izabranoj osnovnoj fascikli na "
+"disku.\n"
+"Samo fascikle koje je napravio korisnik prave se u osnovnoj fascikli "
+"(logički prikaz, prikazi slučajeva upotrebe, i slični, ne prave se)."
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Greška pri pisanju u izlaznu fasciklu"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 ne izgleda kao fascikla. Izaberite ispravnu fasciklu."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Izmenljivost uloge"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Izaberite ispravnu fasciklu"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Vidljivost uloge"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Odredišni fajl već postoji"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Izvezi"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Fajl %1 već postoji u %2.\n"
-"\n"
-"Umbrello može da prebriše fajl, napravi fajl\n"
-"sličnog imena ili da ga uopše i ne napravi."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Primeni na sve preostale fajlove"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Prebriši"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Napravi slično ime fajla"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Ne&moj da praviš fajl"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Višestrukost"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Unesite višestrukost:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Ime pridruživanja"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Unesite ime pridruživanja:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Ime uloge"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Unesite ime uloge:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Unesite ime operacije:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Unesite novi tekst:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "GREŠKA"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Izmeni tekst"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Poravnaj levo"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Poravnaj desno"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Dijagram"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Poravnaj na vrhu"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Novi"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Poravnaj na dnu"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Pr&ikaži"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Poravnaj uspravno u sredini"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Uveličavanje:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Poravnaj vodoravno u sredini"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kôd"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Poravnaj uspravno raspoređeno"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktivni &jezik"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Poravnaj vodoravno raspoređeno"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"Za poravnanje morate izabrati bar dva objekta kao klase ili aktere. Ne možete "
-"poravnati pridruživanja."
+"<p>Dobrodošli u Umbrello.</p>\n"
+"<p>Pomoću UML dijagrama možete dizajnirati i dokumentisati objektno "
+"orijentisani softver.  <a href=\"help:/umbrello\">Priručnik za Umbrello</a> "
+"je dobar uvod u korišćenje UML-a.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Ovo je rezervisana ključna reč za jezik podešenog generatora kôda."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Rezervisana ključna reč"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Izvozim prikaz..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>Dobrodošli u  Umbrello 1.5.  Novo u ovoj verziji su klase pridruživanja, "
+"generacija Ruby koda, eksternalizacija fascikli, mogućnost pretvaranja "
+"interfejsa u klase i još mnogo toga.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Došlo je do greške pri izvozu slike:\n"
+"<p>Dijagrami sa jezičcima i Spoljne fascikle se međusobno isključuju. Ako "
+"vam trebaju Spoljne fascikle onda demarkirajte &quot;Koristi dijagrame sa "
+"jezičcima&quot; u opštim podešavanjima.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Izabrani fajl %1 postoji.\n"
-"Želite li da ga prebrišete?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Fajl već postoji"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "novi_akter"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "novi_slucaj_upotrebe"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "novi_paket"
+"<p>Većini dijagramskih stavki ne može da se promeni veličina, već će to "
+"učiniti same da bi se prilagodile svom sadržaju.\n"
+"Kutijama, beleškama i porukama dijagrama sekvence veličina može biti "
+"promenjena klikom na i povlačenjem crvenog kvadrata.</p>\n"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nova_komponenta"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "novi_cvor"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "novi_artifakt"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "novi_interfejs"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "novi_tip_podataka"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "novo_nabrajanje"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "novi_entitet"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nova_fascikla"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "novi_objekat"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Prazno"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Loše formiran argument"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Nepoznat tip argumenta"
+#: 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 ""
+"<p>Ako želite u dijagram da dodate klasu koja već postoji, samo prevucite "
+"njen unos iz stablolikog prikaza.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nedozvoljeno ime metoda"
+#: 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 ""
+"<p>Umbrello-ov refaktorizacioni agent vam omogućava da premeštate operacije "
+"između klase i njenih izvedenih i baznih klasa.\n"
+"Desno kliknite na klasu da biste otvorili refaktorizacioni agent.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Nepoznat povratni tip"
+#: 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 ""
+"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
+"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Neodređena greška"
+#: 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 ""
+"<p>Poruke dijagrama sekvence mogu imati ulogu konstruktora. Kliknite na "
+"kutiju objekta (umesto na uspravnu liniju) da je učinite konstruktorom.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Dodaj baznu klasu"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Dijagrami sekvence podržavaju poruke za same sebe. Kliknite ponovo na "
+"istu uspravnu liniju da napravite autoporuku.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Dodaj izvedenu klasu"
+#: 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 ""
+"<p>Ako se po učitavanju stranog fajla ništa ne pojavi u prikazu liste, "
+"pokušajte da snimite model pod drugim imenom, zatvorite, i ponovo učitate "
+"snimljeni fajl. Obično će tada prikaz liste biti ispravno popunjen.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Dodaj operaciju"
+#: 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 ""
+"<p>Iseci i kopiraj će takođe izvesti sliku u PNG klipbord, odakle može biti "
+"umetnuta u KWord i druge programe.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Dodaj atribut"
+#: 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 ""
+"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
+"napraviti pomerljivu tačku.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Dodaj bazni interfejs"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Automatsko snimanje možete uključiti u dijalogu za podešavanje Umbrello-a."
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Dodaj izvedeni interfejs"
+#: 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 ""
+"<p>Da li Umbrello nema neku mogućnost koja vam treba? Ako je tako, "
+"obavestite nas.\n"
+"Ili je dodajte u bazu podataka o greškama pomoću prijave grešaka iz menija "
+"Pomoć, ili nam je pošaljite na dospisnu listu uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Bazni klasifikatori"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Sve izabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Izvedeni klasifikatori"
+#: 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 ""
+"<p>Ako ste našli grešku u Umbrello-u, obavestite nas.\n"
+"Greške možete poslati alatom za prijavu grešaka iz menija Pomoć.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Ne mogu da napravim fasciklu: %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 ""
+"<p>Pritiskom na taster Escape postavlja se tekući alat na izabrani alat.\n"
+"Backspace-om se skače na prethodno korišćeni alat.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Ne mogu da snimim prazan dijagram"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Možete izabrati sve objekte pritiskom na Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Došlo je do problema pri snimanju dijagrama u %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 ""
+"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz menija Kôd."
+"</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "novi_stereotip"
diff --git a/tde-i18n-sv/messages/tdesdk/umbrello.po b/tde-i18n-sv/messages/tdesdk/umbrello.po
index c9a00649365..63b3c092209 100644
--- a/tde-i18n-sv/messages/tdesdk/umbrello.po
+++ b/tde-i18n-sv/messages/tdesdk/umbrello.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-08-22 19:17+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -18,248 +18,208 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Självständig kodgenerator i Umbrello UML-modellering"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "Fil att omvandla"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "XSLT-fil att använda"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"© 2006 Gael de Chalendar (alias Kleag), © 2002-2006 Upphovsmän till Umbrello "
-"UML-modellering"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Upphovsmän till Umbrello UML-modellering"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Stefan Asserhäll"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Exporterar alla vyer..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "stefan.asserhall@comhem.se"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Ett antal fel uppstod vid export av bilderna:"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Skriv in aktivitetsnamn"
 
-#: 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 "Ett problem uppstod när filen skulle sparas: %1"
+#: 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 "Skriv in namnet på den nya aktiviteten:"
 
-#: 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 "Fel vid spara"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Vänsterjustera"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Högerjustera"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Synkront meddelande"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Justera uppåt"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asynkront meddelande"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Justera nedåt"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Association"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Justera vertikalt i mitten"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Inneslutning"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Justera horisontellt i mitten"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Ankare"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Justera vertikal fördelning"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etikett"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Justera horisontell fördelning"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Anteckning"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
+"För justering måste du välja minst två objekt som klasser eller aktörer. Du "
+"kan inte justera associationer."
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Ruta"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Formatering"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktör"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Beroende"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalisering"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Aggregering"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Samband"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Riktad association"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementerar (generalisering/realisering)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Sammansättning"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Användningsfall"
-
-#. 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 "Klass"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Starttillstånd"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Sluttillstånd"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Grena ut/slå ihop"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Dela upp/samla ihop"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponent"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Nod"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Beroende"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artefakt"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Association"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Gränssnitt"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Egenassociation"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Datatyp"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Samarbetsmeddelande"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Uppräkningstyp"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sekvensmeddelande"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Objekt"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Samarbets-egenmeddelande"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Lång historik"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Sekvens-egenmeddelande"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Kort historik"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Inneslutning"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Gå med"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Sammansättning"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Dela upp"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realisation"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Korsning"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Enkelriktad association"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Val"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Ankare"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Tillståndsövergång"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Aktivitetsövergång"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Aktivitet"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Tillstånd"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Mångfald"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Slutaktivitet"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Skriv in mångfald:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Startaktivitet"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Associationsnamn"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Meddelande"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Skriv in associationsnamn:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "ODEFINIERAD"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rollnamn"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Välj"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Skriv in rollnamn:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+msgstr ""
+"En operation med samma namn och signatur finns redan. Du kan inte lägga till "
+"den igen."
+
+#: 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 "Detta är ett ogiltigt namn."
+
+#: 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 "Ogiltigt namn"
+
+#: 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 "Namnet används redan."
+
+#: 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 "Namnet är inte unikt"
 
 #: 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."
+"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 ""
-"Åtminstone ett av objekten på klippbordet kunde inte klistras in, eftersom ett "
-"objekt med samma namn redan fins. Alla andra objekt har klistrats in."
+"Åtminstone ett av objekten på klippbordet kunde inte klistras in, eftersom "
+"ett objekt med samma namn redan fins. Alla andra objekt har klistrats in."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -278,10 +238,8 @@ msgid "Cannot Open File"
 msgstr "Kan inte öppna fil"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kan inte skapa katalogen:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Kan inte skapa katalogen:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1352 +253,1518 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Kan inte skapa katalog"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Skriv in tillståndsnamn"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Allmänna alternativ"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Skriv in namnet på det nya tillståndet:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paket är en namnrymd"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Skriv in aktivitet"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuella destruktorer"
 
-#: 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 "Skriv in namnet på den nya aktiviteten:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Skapa tomma konstruktorer"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "ny aktivitet"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Skapa åtkomstmetoder"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-model"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operationer är infogade"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logisk vy"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Åtkomstobjekt är infogade"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Användningsfallsvy"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Åtkomstobjekt är öppna"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentvy"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Importerar fil: %1, Förlopp: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Utplaceringsvy"
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Klar."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Objektsambandsmodell"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Är omfånget %1 en namnrymd eller en klass?"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Datatyper"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ import begär din hjälp"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Aktuell fil har ändrats.\n"
-"Vill du spara den?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Namnrymd"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Filen %1 finns inte."
+#: 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 "Klass"
 
-#: 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 "Laddningsfel"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Internt fel"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Filen %1 verkar vara förstörd."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Syntaxfel innan '%1'"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Ingen XMI-fil hittades i den komprimerade filen %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Tolkningsfel innan '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Ett problem uppstod vid laddning av den extraherade filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<filslut>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Ett problem uppstod vid laddning av filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "Förväntade uttryck"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Ett problem uppstod vid uppladdning av filen: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Syntaxfel i deklaration"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "användningsfallsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "Förväntade }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "klassdiagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "Förväntade namespace"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sekvensdiagram"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "Förväntade {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "samarbetsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Förväntade namn på namnrymd"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "tillståndsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Behöver en typspecifikation att deklarera"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "aktivitetsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "Förväntade en deklaration"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "komponentdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Förväntade konstantuttryck"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "utplaceringsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "Förväntade ')'"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "objektsambandsdiagram"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "Saknar }"
 
-#: 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 "Namn"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Förväntade medlemsinitieringar"
 
-#: 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 "Skriv in namn:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Förväntade en specifikation av basklass"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Detta är ett ogiltigt namn på ett diagram."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Förväntade initieringssats"
 
-#: 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 "Ogiltigt namn"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Förväntade identifierare"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Ett diagram använder redan detta namn."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Förväntade typidentifikation"
 
-#: 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 "Namnet är inte unikt"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Förväntade klassnamn"
 
-#: 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 "Detta är ett ogiltigt namn."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "Förväntade villkor"
 
-#: 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 "Namnet används redan."
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "Förväntade sats"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Namnet du skrev in var inte unikt.\n"
-"Är det vad du avsåg?"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "Förväntade for-initiering"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Namnet är inte unikt"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "Förväntade catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Använd namn"
+#: 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 "Egenska&per"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Skriv in nytt namn"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Startaktivitet"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Är du säker på att du vill ta bort diagrammet %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Slutaktivitet"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Ta bort diagram"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Grena ut/slå ihop"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Ställer in dokument..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Dela upp/samla ihop"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Löser upp objektreferenser..."
+#: 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 "Allmänt"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Laddar UML-komponenter..."
+#: 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 "Allmänna egenskaper"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Laddar diagram..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Aktivitetstyp:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "TDE UML-diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Aktivitetsnamn:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/spara %1 automatiskt"
+#: 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 "Dokumentation"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Gör katalog extern"
+#: 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 "Teckensnitt:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Skriv in modellnamn"
+#: 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 "Teckensnittsinställningar"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Skriv in modellens nya namn:"
+#: 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 "Färg"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Vyer"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Komponentfärger"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Namnet du skrev in var ogiltigt!\n"
-"Skapandeprocessen har avbrutits."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktiviteter"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Namnet inte giltigt"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Ny aktivitet..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Namnet du skrev in var inte unikt!\n"
-"Skapandeprocessen har avbrutits."
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Ta bort ankare"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Skapa avbrutet"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Byt namn"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Laddar listvy..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Ny aktivitet"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Mappen måste tömmas innan den kan tas bort."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "ny aktivitet"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Mapp inte tom"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Byt namn på aktivitet"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"En operation med samma namn och signatur finns redan. Du kan inte lägga till "
-"den igen."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Skriv in aktivitetens nya namn:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Skriv in aktivitetsnamn"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Namn:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "nytt tillstånd"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Typ:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalisering"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Associationer"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Egenassociation"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Associationsegenskaper"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Samarbetsmeddelande"
+#: 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 "Allmänna alternativ"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sekvensmeddelande"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roller"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Samarbets-egenmeddelande"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Rollinställningar"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Sekvens-egenmeddelande"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Teckensnitt för association"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realisation"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Egenskaper för roll A"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Enkelriktad association"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Egenskaper för roll B"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Exportera"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Synlighet för roll A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Synlighet för roll B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Nytt"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Ändringsbarhet för roll A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Visa"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Ändringsbarhet för roll B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Kod"
+msgid "Rolename:"
+msgstr "Rollnamn:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktivt &språk"
+msgid "Multiplicity:"
+msgstr "Mångfald:"
 
-#. 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
+#: 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 "Documentation"
-msgstr "Dokumentation"
+msgid "Public"
+msgstr "Öppen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Två snedstreck (//)"
+msgid "Private"
+msgstr "Privat"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Snedstreck och asterisk (/**  */)"
+msgid "Protected"
+msgstr "Skyddad"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+msgid "Implementation"
+msgstr "Implementering"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ kodgenerering</p>"
+msgid "Changeable"
+msgstr "Ändringsbar"
 
-#. 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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Allmänt"
+msgid "Frozen"
+msgstr "Fryst"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "Skapa metodskelett"
+msgid "Add only"
+msgstr "Bara tillägg"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Använd följande för klasser i skapad kod:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Klassnamn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Aktörs&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Paket&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Variabel</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Användningsfalls&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Gränssnitts&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Komponent&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Artefakt&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Sträng</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Uppräknings&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Datatyp&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Objekt&namn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotypnamn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Paketnamn:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Klassnamn"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Abs&trakt klass"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Deklarationsfiler</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "A&bstrakt användarfall"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Projektgenerering"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Körbart program"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Skapa ANT-byggdokument"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Rita som"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Skapa metoder automatiskt"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Standard"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Tomma konstruktormetoder"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Fyllnad:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Åtkomstmetoder för associationer"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "Bib&liotek"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Åtkomstmetoder för attribut"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabell"
 
-#. 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 "Öppen"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Synlighet"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Privat"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Öppen"
 
-#. 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 "Skyddad"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivat"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Från ovanliggande objekt"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Sk&yddad"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Förvalt attributåtkomstområde:"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "I&mplementering"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Förvalt associationsfältområde:"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Klassnamn:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Från ovanliggande roll"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Instansnamn:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java kodgenerering</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Rita som aktör"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Nummertecken (#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Flera instanser"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Start-slut (=start  =slut)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Visa borttagning"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby kodgenerering</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Komponentnamn:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Nodnamn:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotypnamn:"
+
+#: 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 ""
+"Namnet du har valt\n"
+"används redan.\n"
+"Namnet har återställts."
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Namnet är inte unikt"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Attribut"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ytt attribut..."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operationer"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "&Ny operation..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Mallar"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&y mall..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Uppräkningsvärden"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ytt uppräkningsvärde..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Objektattribut"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ytt objektattribut..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Ta bort ankare"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "Egenska&per"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Visa"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Operatio&ner"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Synlighet"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "O&perationssignatur"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Att&ribut"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&yp"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Attr&ibutsignatur"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Rita som cirkel"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Visning"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Visningsalternativ"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Attributalternativ"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Operationsalternativ"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Mallinställningar"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Alternativ för uppräkningsvärden"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Objektattributalternativ"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Inneslutning"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Innehållsinställningar"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Klassassociationer"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "ny_klass"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Ny klass"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Klassattribut"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Klassoperationer"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Kodgenereringsalternativ"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Språk"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Skapa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Kataloger"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Avslut"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Skriv alla filer som skapas till katalog:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kod skapad"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Blä&ddra..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Inte skapad"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "B&läddra..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Inte ännu skapad"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Infoga huvudfiler från katalog:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Katalogen %1 finns inte. Vill du skapa den nu?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
-"Filer som skapas av kodgeneratorn kommer att skrivas i den här katalogen"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Utmatningskatalogen finns inte"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Skapa katalog"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Skapa inte"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
-msgstr "Filer i den här katalogen används som huvudfiler i den skapade koden"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
+msgstr ""
+"Katalogen kunde inte skapas.\n"
+"Försäkra dig om att du har skrivrättighet i dess överliggande katalog eller "
+"välj en annan, giltig, katalog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Överskrivningspolicy"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Fel när katalog skulle skapas"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Välj en giltig katalog."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Om en fil med samma namn som namnet kodgeneratorn\n"
-"vill använda som utmatningsfil redan finns:"
+"Utmatningskatalogen finns, men är inte skrivbar.\n"
+"Ställ in lämpliga rättigheter eller välj en annan katalog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Skriv &över"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Fel vid skrivning till utmatningskatalog"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Skriv över befintliga filer om de finns i destinationskatalogen"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 verkar inte vara en katalog. Välj en giltig katalog."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "F&råga"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Välj en giltig katalog"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Om en fil med samma namn redan finns, tala om vad som ska göras"
+msgid "Code Viewer"
+msgstr "Kodvisning"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "An&vänd annat namn"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Inga alternativ tillgängliga.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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 ""
-"Om en fil redan finns i destinationskatalogen, välj ett annat namn att använda "
-"genom att lägga till ett suffix till filnamnet"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Formatering"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Rader"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "Akt&uellt diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Radslutstil:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Alla diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Intenteringstyp:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Välj diagram"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Indenteringssteg:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "Diagram&typ"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"Unix (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Val"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Användningsfall"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Samarbete"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Ingen indentering"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvens"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulator"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Tillstånd"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Mellanslag"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponent"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Kommentarnivå"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Utplacering"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "TDE UML-diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Inga diagram markerade."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Formatet som bilderna kommer att exporteras till"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Anteckningsdokumentation"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Destinationsfilen finns redan"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
-"Skriv &kommentarer för sektioner även om\n"
-"sektionen är tom"
+"Filen %1 finns redan i %2.\n"
+"\n"
+"Umbrello kan skriva över filen, skapa ett liknande\n"
+"filnamn eller inte skapa den här filen."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Tillämpa för alla återstående filer"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Skriv &över"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Skapa ett liknande filnamn"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Skapa &inte en fil"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parameteregenskaper"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Typ:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Namn:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Ursprungligt värde:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Överföringsriktning"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Skriver kommentarer för att ange de olika sektionerna (öppen, privat, etc.) i "
-"en klass, även om sektionerna är tomma"
+"\"in\" är en läsbar parameter, \"out\" är en skrivbar parameter och \"inout"
+"\" är en parameter som kan läsas och skrivas."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Skriv dokumenteringskommentarer även om tomma"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Innehållsobjekt"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Skriv kommentarer för klass- och &metoddokumentation även om tomma"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Välj operation"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Språkalternativ"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sekvensnummer:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Kodgenereringsguide"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Klassoperation:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Välj klasser"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Egen operation:"
 
-#. 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:30
+msgid "Umbrello Setup"
+msgstr "Inställning av Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Användargränssnitt"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Inställning av användargränssnitt"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Linjefärg:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Standardfärg"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Fyllnadsfärg:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "S&tandardfärg"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Linjebredd:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "S&tandardbredd"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "An&vänd fyllnadsfärg"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Placera alla klasser som du vill skapa kod\n"
-"för i listan till höger"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Lägg till klass för kodgenerering"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Aktivera ångra"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Markerade klasser"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Använd diagram med flikar"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Ta bort klass från kodgenerering"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Använd nya C++, Java och Ruby kodgeneratorer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Tillgängliga klasser"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Använd vinklade associationslinjer"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Kodgenereringsstatus"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Spara automatiskt"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Tryck på knappen Generera för att starta kodgenereringen"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "Aktivera spara a&utomatiskt"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Kodgenereringsstatus"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Välj intervall för spara automatiskt (minuter):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kodvisning"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Ange ändelse för spara automatiskt:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Visa gömda block"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt><p>Filen som sparas automatiskt kommer att lagras som ~/autosave.xmi om "
+"den sparas automatiskt innan du har sparat filen manuellt.</p><p>Om du redan "
+"sparat den, lagras filen som sparas automatiskt i samma katalog som filen "
+"och får samma namn som filen, följt av angivet suffix.</p><p>Om suffixet är "
+"samma som filen du har sparat, leder det till att din fil skrivs över av "
+"filen som sparas automatiskt.</p></qt>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">komponentnamn här</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Start"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Visa blocktyp"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Sta&rtlogotyp"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Färger"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Dagens tips"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Teckensnitt:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Ladda senaste projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Papper:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Starta nytt projekt med:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Markerad:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Inget diagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML-objektblock:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Klassdiagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Gömt block:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Användningsfallsdiagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Text som inte kan redigeras:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sekvensdiagram"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Text som kan redigeras:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Samarbetsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diagramegenskaper"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Tillståndsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Namn:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Aktivitetsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zooma:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Komponentdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Utplaceringsdiagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Klassinställningar"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Visa s&ynlighet"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Visa attribut"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Visa operationer"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Visa stereo&typ"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Visa attributsignatur"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Visa paket"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Visa operationssignatur"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Visa r&utnät"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Startomfattning"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Lås &till rutnät"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Förvalt attributområde:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Lås komponentstorlek"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Förvalt operationsområde:"
 
-#. 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."
-msgstr ""
-"Lås komponentens storlek till en multipel av rutnätets storlek.\n"
-"Om \"Lås till rutnät\" är aktiverat, justeras alltid komponenter till rutnätet "
-"längs alla fyra sidor."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kodgenerering"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Rutnätsmellanrum:  "
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Kodgenereringsinställningar"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Kodvisningsinställningar"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Starttillstånd"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Linjebredd:  "
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Sluttillstånd"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Exportera alla vyer"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tillståndstyp:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Katalog att spara diagram i:"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Tillståndsnamn:"
 
-#. 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"
-msgstr "Baskatalogen som används för att spara bilderna"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Komponentfärg"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "B&ildtyp:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Attributegenskaper"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Formatet som bilderna kommer att exporteras till"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Omfattning av &klassificering (\"statisk\")"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Använd &kataloger"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Öppen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Skapa samma trädstruktur som används i dokumentet för att\n"
-"lagra vyerna i målkatalogen"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Sk&yddad"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "I&mplementering"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Du har skrivit in ett ogiltigt attributnamn."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Ogiltigt attributnamn"
+
+#: dialogs/umlattributedialog.cpp:163
 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)."
-msgstr ""
-"Vyerna lagras i kataloger i dokumentet. Samma trädstruktur som används i "
-"dokumentet för att lagra vyerna kan skapas i den valda baskatalogen med det här "
-"alternativet.\n"
-"Bara kataloger som skapats av användaren skapas i baskatalogen (logisk vy, "
-"användningsfallsvy med flera, skapas inte)."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Attributnamnet du har valt används redan i den här operationen."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Rollegenskaper"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Attributnamnet är inte unikt"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rollnamn:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Objektattributegenskaper"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Mångfald:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Stan&dardvärde:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Ändringsbarhet för roll"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Längd eller värden:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Bara tillägg"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automatisk uppräkning"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Fryst"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Tillåt &null"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Ändringsbar"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Attribut:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Synlighet för roll"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indexerande"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Implementering"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "I&nget"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Välkommen till Umbrello.</p>\n"
-"<p>UML-diagram låter dig konstruera och dokumentera objektorienterad "
-"programvara. <a href=\"help:/umbrello\">Umbrellos handbok</a> "
-"är en bra introduktion till användning av UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primärt"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Välkommen till Umbrello 1.5. Nytt i den här versionen är "
-"associationsklasser, Ruby kodgenerering, kataloger som kan göras externa, "
-"möjlighet att ändra gränssnitt till klasser, med mera.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Index"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Diagram med flikar och kataloger som gjorts externa är ömsesidigt "
-"uteslutande. Om du behöver kataloger som gjorts externa avmarkera &quot;Använd "
-"diagram med flikar&quot; i Allmänna inställningar.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Unikt"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Storleken kan inte ändras för de flesta diagram, utan deras storlek ändras "
-"för att passa innehållet.\n"
-"Storleken på rutor, anteckningar och meddelanden i sekvensdiagram kan ändras. "
-"Klicka bara och dra den röda fyrkanten.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Du har skrivit in ett ogiltigt objektattributnamn."
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Om du vill lägga till en befintlig klass i ett diagram, dra bara dess post "
-"från trädvyn.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Ogiltigt objektattributnamn"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p> Umbrellos omflyttningsverktyg låter dig flytta operationer mellan en\n"
-"klass och dess härledda- och basklasser.\n"
-"Högerklicka på en klass för att öppna omflyttningsverktyget.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "Objektattributnamnet du har valt används redan i den här operationen."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Objekt i sekvensdiagram kan ha en borttagningsruta, och ritas som aktörer. "
-"Dubbelklicka på ett för\n"
-"att se egenskapsdialogrutan.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Objektattributnamnet är inte unikt"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Sekvensdiagrammeddelanden kan fungera som konstruktorer. Klicka på "
-"objektrutan (istället för den vertikala linjen) för att göra det till en "
-"konstruktor.</p>\n"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Operationsegenskaper"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Sekvensdiagrammeddelanden stöder meddelanden till sig själva. Klicka på "
-"samma vertikal linje igen för att skapa ett automatiskt meddelande.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "Ab&strakt operation"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Om ingenting visas i listvyn när en främmande fil laddas, försök att spara "
-"modelen med ett annat namn,\n"
-"stänga, och ladda om den sparade filen. Oftast befolkas listvyn då på ett "
-"riktigt sätt.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Förfrågan (\"konstant\")"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Klipp ut och kopiera exporterar också bilden som PNG till klippbordet, som "
-"kan klistras in i Kword\n"
-"och andra program.</p>\n"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametrar"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Associationer måste inte gå i raka linjer, att dubbelklicka på en skapar en "
-"flyttbar punkt.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "N&y parameter..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Du kan aktivera spara automatiskt i dialogrutan för inställning av "
-"Umbrello.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Du har skrivit in ett ogiltigt parameternamn."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Saknas en funktion som du behöver i Umbrello? Tala gärna om det för oss.\n"
-"Lägg antingen till den i feldatabasen med Rapportera fel i hjälpmenyn\n"
-"eller skicka den till e-postlistan uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Ogiltigt parameternamn"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Du kan ta bort alla markerade objekt genom att trycka på Delete eller "
-"backsteg.</p>\n"
+"Parameternamnet som du har valt\n"
+"används redan i den här operationen."
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Om du har hittat ett fel i Umbrello, tala om det för oss.\n"
-"Du kan skicka felrapporter med felrapporteringsverktyget i hjälpmenyn.</p>\n"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parameternamnet är inte unikt."
 
-#: tips.txt:97
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Genom att trycka på tangenten Esc, blir aktuellt verktyg "
-"markeringsverktyget.\n"
-"Backsteg går till det senast använda verktyget.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Parameternamnet som du har valt används redan i den här operationen."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Du har skrivit in ett ogiltigt operationsnamn."
 
-#: tips.txt:103
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Ogiltigt operationsnamn."
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "En operation med den signaturen finns redan i %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Välj ett annat namn eller parameterlista."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Rollegenskaper"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Mallegenskaper"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Du har skrivit in ett ogiltigt mallnamn."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Ogiltigt mallnamn."
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Du kan markera alla objekt genom att trycka på Ctrl-A.</p>\n"
+"Mallparameternamnet som du har valt används redan i den här operationen."
+
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Mallparameternamnet är inte unikt."
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Klassvisningsalternativ"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diagramfärger"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Namnet du har skrivit in är ogiltigt."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Namnet du har skrivit in är inte unikt."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Namnet är inte unikt"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linje:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Fyllnad:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "S&tandard"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "An&vänd fyllnad"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Exporterar alla vyer..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Ett antal fel uppstod vid export av bilderna:"
+
+#: 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 "Ett problem uppstod när filen skulle sparas: %1"
 
-#: tips.txt:108
+#: 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 "Fel vid spara"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Självständig kodgenerator i Umbrello UML-modellering"
+
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "Fil att omvandla"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "XSLT-fil att använda"
+
+#: docgenerators/main.cpp:64
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Du kan skapa och ställa in en ny klass med hjälp av guiden \"Ny klass\" i "
-"menyn Kod.</p>\n"
+"© 2006 Gael de Chalendar (alias Kleag), © 2002-2006 Upphovsmän till Umbrello "
+"UML-modellering"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Upphovsmän till Umbrello UML-modellering"
+
+#: 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 "Namn"
+
+#: 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 "Skriv in namn:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Skriv in operationsnamn:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Skriv in ny text:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "FEL"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Ändra text"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Katalogfilen %1 finns inte."
+
+#: 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 "Laddningsfel"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Katalogfilen %1 kan inte öppnas."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1694,6 +1818,10 @@ msgstr "Ny operation..."
 msgid "Select Operation..."
 msgstr "Välj operation..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Ändra text..."
@@ -1745,6 +1873,19 @@ msgstr "Nytt"
 msgid "Rename..."
 msgstr "Byt namn..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Inklistringsfel"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Linjefärg..."
@@ -1773,14 +1914,26 @@ msgstr "Gör katalog intern"
 msgid "Import Classes..."
 msgstr "Importera klasser..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr "Delsystem"
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artefakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Komponentdiagram..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Nod"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Utplaceringsdiagram..."
@@ -1789,10 +1942,18 @@ msgstr "Utplaceringsdiagram..."
 msgid "Folder"
 msgstr "Mapp"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Objekt"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Objektsambandsdiagram..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktör"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Användningsfallsdiagram..."
@@ -1829,6 +1990,18 @@ msgstr "Nytt objektattribut..."
 msgid "Export as Picture..."
 msgstr "Exportera som bild..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Gränssnitt"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Datatyp"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Uppräkningstyp"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Klassdiagram..."
@@ -1849,26 +2022,10 @@ msgstr "Sekvensdiagram..."
 msgid "Collaboration Diagram..."
 msgstr "Samarbetsdiagram..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Attribut"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operationer"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Bara öppen"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Synlighet"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Operationssignatur"
@@ -1881,11 +2038,6 @@ msgstr "Attributsignatur"
 msgid "Stereotype"
 msgstr "Stereotyp"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Visa"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Attribut..."
@@ -1910,14 +2062,6 @@ msgstr "Fyllnadsfärg..."
 msgid "Use Fill Color"
 msgstr "Använd fyllnadsfärg"
 
-#: 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 "Färg"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktör..."
@@ -1946,10 +2090,26 @@ msgstr "Uppräkningstyp..."
 msgid "Package..."
 msgstr "Paket..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Starttillstånd"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Sluttillstånd"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Tillstånd..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Startaktivitet"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Slutaktivitet"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Delsystem..."
@@ -1994,6 +2154,14 @@ msgstr "Ta bort ankare"
 msgid "Change Association Name..."
 msgstr "Ändra associationsnamn..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Rensa diagram"
@@ -2028,8 +2196,8 @@ msgstr "filens katalog"
 
 #: 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 ""
 "behåll trädstrukturen som används för att lagra vyerna i dokumentet i "
 "målkatalogen"
@@ -2039,191 +2207,96 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "© 2001 Paul Hensgen, © 2002-2006 Upphovsmän till Umbrello UML-modellering"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Felaktig användning av associationer."
-
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Associationsfel"
-
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Katalogfilen %1 finns inte."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Katalogfilen %1 kan inte öppnas."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Stefan Asserhäll"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "stefan.asserhall@comhem.se"
-
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Klar."
-
-#: 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 ""
-"Håll nere Skift eller Ctrl för att flytta längs X-axeln. Håll nere Skift och "
-"Ctrl för att flytta längs Y-axeln. Ett klick med höger musknapp avbryter "
-"förflyttningen."
-
-#: 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 ""
-"Håll nere Skift eller Ctrl för att flytta längs X-axeln. Håll nere Skift och "
-"Ctrl för att flytta längs Y-axeln. Ett klick med höger musknapp avbryter "
-"storleksändringen."
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Är omfånget %1 en namnrymd eller en klass?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ import begär din hjälp"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Namnrymd"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Importerar fil: %1, Förlopp: %2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Internt fel"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Syntaxfel innan '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Tolkningsfel innan '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<filslut>"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "ny_aktör"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "Förväntade uttryck"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "nytt_användningsfall"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Syntaxfel i deklaration"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nytt_paket"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "Förväntade }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "ny_komponent"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "Förväntade namespace"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "ny_nod"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "Förväntade {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "ny_artefakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Förväntade namn på namnrymd"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nytt_gränssnitt"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Behöver en typspecifikation att deklarera"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "ny_datatyp"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "Förväntade en deklaration"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "ny_uppräkningstyp"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Förväntade konstantuttryck"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nytt_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "Förväntade ')'"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "ny_katalog"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "Saknar }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "ny_association"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Förväntade medlemsinitieringar"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nytt_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Förväntade en specifikation av basklass"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Förväntade initieringssats"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Tom"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Förväntade identifierare"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Felaktigt argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Förväntade typidentifikation"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Okänd argumenttyp"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Förväntade klassnamn"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Felaktigt metodnamn"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "Förväntade villkor"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Okänd returtyp"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "Förväntade sats"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Ospecificerat fel"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "Förväntade for-initiering"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr ""
+"Det här är ett reserverat nyckelord i språket som är inställt för "
+"kodgenerering."
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "Förväntade catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Reserverade nyckelord"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2237,106 +2310,66 @@ msgstr "Skriv in objektnamn:"
 msgid "new_parameter"
 msgstr "ny_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Allmänna alternativ"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paket är en namnrymd"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuella destruktorer"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Skapa tomma konstruktorer"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Skapa åtkomstmetoder"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operationer är infogade"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Åtkomstobjekt är infogade"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Åtkomstobjekt är öppna"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Sida %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Skriv in diagramnamn"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Lägg till basklass"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Skriv diagrammets nya namn:"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Lägg till härledd klass"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Du ska just ta bort hela diagrammet.\n"
-"Är du säker?"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Lägg till operation"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Ta bort diagram?"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Lägg till attribut"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Namnbyte avbrutet"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Lägg till basgränssnitt"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Att byta namn på ett objekt av listvytypen %1 är ännu inte implementerat."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Lägg till härlett gränssnitt"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funktion inte implementerad"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Basklassificeringar"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Namnet du skrev in var ogiltigt!\n"
-"Namnbytesprocessen har avbrutits."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Härledda klassificeringar"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "ny_association"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Skriv in tillståndsnamn"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nytt_attribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Skriv in namnet på det nya tillståndet:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "ny_mall"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Skriv in aktivitet"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "ny_operation"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Felaktig användning av associationer."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "nytt_värde"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Associationsfel"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "nytt_fält"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "nytt tillstånd"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2490,11 +2523,6 @@ msgstr "&Exportera som bild..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Exportera &alla diagram som bilder..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "Egenska&per"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Zoomkontroll"
@@ -2579,14 +2607,21 @@ msgstr "&Dokumentation"
 msgid "Opening file..."
 msgstr "Öppnar fil..."
 
+#: 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 "Skapar nytt dokument..."
 
 #: 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"
@@ -2623,6 +2658,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-komprimerad XMI-fil\n"
 "*|Alla filer"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2631,6 +2670,10 @@ msgstr ""
 "Filen %1 finns redan.\n"
 "Vill du skriva över den?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Skriv över"
@@ -2666,11 +2709,11 @@ msgstr "Infogar klippbordets innehåll..."
 
 #: 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 ""
-"Umbrello kunde inte klistra in klippbordets innehåll. Objekten på klippbordet "
-"kan ha fel typ för att kunna klistras in här."
+"Umbrello kunde inte klistra in klippbordets innehåll. Objekten på "
+"klippbordet kan ha fel typ för att kunna klistras in här."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2724,1262 +2767,1316 @@ msgstr "Alla filer"
 msgid "Select Code to Import"
 msgstr "Välj kod att importera"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Klassnamn:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Aktörs&namn:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nytt_attribut"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Paket&namn:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "ny_mall"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "Användningsfalls&namn:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "ny_operation"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Gränssnitts&namn:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "nytt_värde"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Komponent&namn:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "nytt_fält"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Artefakt&namn:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-model"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Uppräknings&namn:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logisk vy"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Datatyp&namn:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Användningsfallsvy"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Objekt&namn:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentvy"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotypnamn:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Utplaceringsvy"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Paketnamn:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Objektsambandsmodell"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Abs&trakt klass"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Datatyper"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "A&bstrakt användarfall"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Aktuell fil har ändrats.\n"
+"Vill du spara den?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Körbart program"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Filen %1 finns inte."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Rita som"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Filen %1 verkar vara förstörd."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Standard"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Ingen XMI-fil hittades i den komprimerade filen %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "Bib&liotek"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Ett problem uppstod vid laddning av den extraherade filen: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabell"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Ett problem uppstod vid laddning av filen: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Öppen"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Ett problem uppstod vid uppladdning av filen: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivat"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "användningsfallsdiagram"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Sk&yddad"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "klassdiagram"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "I&mplementering"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sekvensdiagram"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Klassnamn:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "samarbetsdiagram"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Instansnamn:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "tillståndsdiagram"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Rita som aktör"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "aktivitetsdiagram"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Flera instanser"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "komponentdiagram"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Visa borttagning"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "utplaceringsdiagram"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Komponentnamn:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "objektsambandsdiagram"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Nodnamn:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Detta är ett ogiltigt namn på ett diagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotypnamn:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Ett diagram använder redan detta namn."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Namnet du har valt\n"
-"används redan.\n"
-"Namnet har återställts."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Namnet är inte unikt"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linje:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Fyllnad:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "S&tandard"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "An&vänd fyllnad"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktiviteter"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Ny aktivitet..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Byt namn"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Ny aktivitet"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Byt namn på aktivitet"
+"Namnet du skrev in var inte unikt.\n"
+"Är det vad du avsåg?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Skriv in aktivitetens nya namn:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Använd namn"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Associationsegenskaper"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Skriv in nytt namn"
 
-#: 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 "Allmänna alternativ"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Är du säker på att du vill ta bort diagrammet %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roller"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Ta bort diagram"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Rollinställningar"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Ställer in dokument..."
 
-#: 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 "Teckensnittsinställningar"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Löser upp objektreferenser..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Teckensnitt för association"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Laddar UML-komponenter..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Mallegenskaper"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Laddar diagram..."
 
-#: 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 "Allmänna egenskaper"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/spara %1 automatiskt"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Typ:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Gör katalog extern"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Namn:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Skriv in modellnamn"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Du har skrivit in ett ogiltigt mallnamn."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Skriv in modellens nya namn:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Ogiltigt mallnamn."
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Vyer"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"Mallparameternamnet som du har valt används redan i den här operationen."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Mallparameternamnet är inte unikt."
+"Namnet du skrev in var ogiltigt!\n"
+"Skapandeprocessen har avbrutits."
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Objektattributegenskaper"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Namnet inte giltigt"
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Stan&dardvärde:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Namnet du skrev in var inte unikt!\n"
+"Skapandeprocessen har avbrutits."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Längd eller värden:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Skapa avbrutet"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automatisk uppräkning"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Laddar listvy..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Tillåt &null"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Mappen måste tömmas innan den kan tas bort."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Attribut:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Mapp inte tom"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indexerande"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Namnbyte avbrutet"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "I&nget"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Att byta namn på ett objekt av listvytypen %1 är ännu inte implementerat."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primärt"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funktion inte implementerad"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Namnet du skrev in var ogiltigt!\n"
+"Namnbytesprocessen har avbrutits."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Unikt"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Sida %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Du har skrivit in ett ogiltigt objektattributnamn."
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Skriv in diagramnamn"
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Ogiltigt objektattributnamn"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Skriv diagrammets nya namn:"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Objektattributnamnet du har valt används redan i den här operationen."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Objektattributnamnet är inte unikt"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Visning"
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Du ska just ta bort hela diagrammet.\n"
+"Är du säker?"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Klassvisningsalternativ"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Ta bort diagram?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diagramfärger"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Exporterar vy..."
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Namnet du har skrivit in är ogiltigt."
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "Ett fel uppstod under export av bilden:\n"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Namnet du har skrivit in är inte unikt."
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Den markerade filen %1 finns redan.\n"
+"Vill du skriva över den?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Typ:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Filen finns redan"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Inställning av Umbrello"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Kan inte skapa katalog: %1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Användargränssnitt"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Kan inte spara ett tomt diagram"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Inställning av användargränssnitt"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Ett problem uppstod medan diagrammet sparades i %1"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Linjefärg:"
+#: 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 ""
+"Håll nere Skift eller Ctrl för att flytta längs X-axeln. Håll nere Skift och "
+"Ctrl för att flytta längs Y-axeln. Ett klick med höger musknapp avbryter "
+"förflyttningen."
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Standardfärg"
+#: 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 ""
+"Håll nere Skift eller Ctrl för att flytta längs X-axeln. Håll nere Skift och "
+"Ctrl för att flytta längs Y-axeln. Ett klick med höger musknapp avbryter "
+"storleksändringen."
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Fyllnadsfärg:"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "S&tandardfärg"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Synkront meddelande"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Linjebredd:"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asynkront meddelande"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "S&tandardbredd"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etikett"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "An&vänd fyllnadsfärg"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Anteckning"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Aktivera ångra"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Ruta"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Använd diagram med flikar"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Samband"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Använd nya C++, Java och Ruby kodgeneratorer"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Riktad association"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Använd vinklade associationslinjer"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementerar (generalisering/realisering)"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Spara automatiskt"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Lång historik"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "Aktivera spara a&utomatiskt"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Kort historik"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Välj intervall för spara automatiskt (minuter):"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Gå med"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Ange ändelse för spara automatiskt:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Dela upp"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
-"<qt>"
-"<p>Filen som sparas automatiskt kommer att lagras som ~/autosave.xmi om den "
-"sparas automatiskt innan du har sparat filen manuellt.</p>"
-"<p>Om du redan sparat den, lagras filen som sparas automatiskt i samma katalog "
-"som filen och får samma namn som filen, följt av angivet suffix.</p>"
-"<p>Om suffixet är samma som filen du har sparat, leder det till att din fil "
-"skrivs över av filen som sparas automatiskt.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Korsning"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Start"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Val"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Sta&rtlogotyp"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Aktivitetsövergång"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Dagens tips"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Meddelande"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Ladda senaste projekt"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "ODEFINIERAD"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Starta nytt projekt med:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Välj"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Inget diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Klassdiagram"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Användningsfallsdiagram"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sekvensdiagram"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Samarbetsdiagram"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Visa operationer"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Tillståndsdiagram"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Aktivitetsdiagram"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Rensa diagram"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Komponentdiagram"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Utplaceringsdiagram"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalisering"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Klassinställningar"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Visa s&ynlighet"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Visa attribut"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Associationsnamn"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Visa operationer"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Visa stereo&typ"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Visa attributsignatur"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Visa paket"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Standard"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Startomfattning"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Förvalt attributområde:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Två snedstreck (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Förvalt operationsområde:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Snedstreck och asterisk (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kodgenerering"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Kodgenereringsinställningar"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ kodgenerering</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Kodvisningsinställningar"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Skapa metodskelett"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Operationsegenskaper"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Använd följande för klasser i skapad kod:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "Ab&strakt operation"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Omfattning av &klassificering (\"statisk\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Förfrågan (\"konstant\")"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Variabel</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Sk&yddad"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "I&mplementering"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametrar"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "N&y parameter..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Sträng</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Du har skrivit in ett ogiltigt parameternamn."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Ogiltigt parameternamn"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Parameternamnet som du har valt\n"
-"används redan i den här operationen."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parameternamnet är inte unikt."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Parameternamnet som du har valt används redan i den här operationen."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Klassnamn"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Du har skrivit in ett ogiltigt operationsnamn."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Deklarationsfiler</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Ogiltigt operationsnamn."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Projektgenerering"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"En operation med den signaturen finns redan i %1.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Skapa ANT-byggdokument"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Välj ett annat namn eller parameterlista."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Skapa metoder automatiskt"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Egenskaper för roll A"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Tomma konstruktormetoder"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Egenskaper för roll B"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Åtkomstmetoder för associationer"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Synlighet för roll A"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Åtkomstmetoder för attribut"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Synlighet för roll B"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Från ovanliggande objekt"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Ändringsbarhet för roll A"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Förvalt attributåtkomstområde:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Ändringsbarhet för roll B"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Förvalt associationsfältområde:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Innehållsobjekt"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Från ovanliggande roll"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Anteckningsdokumentation"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java kodgenerering</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ytt attribut..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Nummertecken (#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "&Ny operation..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Start-slut (=start  =slut)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Mallar"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby kodgenerering</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&y mall..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Språk"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Uppräkningsvärden"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Kataloger"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ytt uppräkningsvärde..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Skriv alla filer som skapas till katalog:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Objektattribut"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Blä&ddra..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ytt objektattribut..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "B&läddra..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Startaktivitet"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Infoga huvudfiler från katalog:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Slutaktivitet"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Filer som skapas av kodgeneratorn kommer att skrivas i den här katalogen"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Aktivitetstyp:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr "Filer i den här katalogen används som huvudfiler i den skapade koden"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Aktivitetsnamn:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Överskrivningspolicy"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Komponentfärger"
+#: 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 ""
+"Om en fil med samma namn som namnet kodgeneratorn\n"
+"vill använda som utmatningsfil redan finns:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Attributegenskaper"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Skriv &över"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Ursprungligt värde:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Skriv över befintliga filer om de finns i destinationskatalogen"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Öppen"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "F&råga"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Du har skrivit in ett ogiltigt attributnamn."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Om en fil med samma namn redan finns, tala om vad som ska göras"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Ogiltigt attributnamn"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "An&vänd annat namn"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Attributnamnet du har valt används redan i den här operationen."
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Om en fil redan finns i destinationskatalogen, välj ett annat namn att "
+"använda genom att lägga till ett suffix till filnamnet"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Attributnamnet är inte unikt"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Formatering"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Välj operation"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Rader"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sekvensnummer:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Radslutstil:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Klassoperation:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Intenteringstyp:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Egen operation:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Indenteringssteg:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagram"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "Unix (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "Akt&uellt diagram"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Alla diagram"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Ingen indentering"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Välj diagram"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulator"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "Diagram&typ"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Mellanslag"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Val"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Kommentarnivå"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Samarbete"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Skriv &kommentarer för sektioner även om\n"
+"sektionen är tom"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvens"
+#: 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 ""
+"Skriver kommentarer för att ange de olika sektionerna (öppen, privat, etc.) "
+"i en klass, även om sektionerna är tomma"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Utplacering"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Skriv dokumenteringskommentarer även om tomma"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Inga diagram markerade."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Skriv kommentarer för klass- och &metoddokumentation även om tomma"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Visningsalternativ"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Språkalternativ"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Attributalternativ"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Kodgenereringsguide"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Operationsalternativ"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Välj klasser"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Mallinställningar"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Placera alla klasser som du vill skapa kod\n"
+"för i listan till höger"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Alternativ för uppräkningsvärden"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Lägg till klass för kodgenerering"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Objektattributalternativ"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Markerade klasser"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Innehållsinställningar"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Ta bort klass från kodgenerering"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Associationer"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Tillgängliga klasser"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Klassassociationer"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Kodgenereringsstatus"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Operatio&ner"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Tryck på knappen Generera för att starta kodgenereringen"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Synlighet"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Kodgenereringsstatus"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "O&perationssignatur"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Visa gömda block"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ket"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">komponentnamn här</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Att&ribut"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&yp"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Visa blocktyp"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Attr&ibutsignatur"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Färger"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Rita som cirkel"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Teckensnitt:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Starttillstånd"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Papper:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Sluttillstånd"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Markerad:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tillståndstyp:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML-objektblock:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Tillståndsnamn:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Gömt block:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Komponentfärg"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Text som inte kan redigeras:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "ny_klass"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Text som kan redigeras:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Ny klass"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diagramegenskaper"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Klassattribut"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zooma:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Klassoperationer"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parameteregenskaper"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Visa r&utnät"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Överföringsriktning"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Lås &till rutnät"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Lås komponentstorlek"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"in\" är en läsbar parameter, \"out\" är en skrivbar parameter och \"inout\" "
-"är en parameter som kan läsas och skrivas."
+"Lås komponentens storlek till en multipel av rutnätets storlek.\n"
+"Om \"Lås till rutnät\" är aktiverat, justeras alltid komponenter till "
+"rutnätet längs alla fyra sidor."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Skapa"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Rutnätsmellanrum:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Avslut"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kod skapad"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Inte skapad"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Linjebredd:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Inte ännu skapad"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Exportera alla vyer"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Katalogen %1 finns inte. Vill du skapa den nu?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Katalog att spara diagram i:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Utmatningskatalogen finns inte"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Baskatalogen som används för att spara bilderna"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Skapa katalog"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "B&ildtyp:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Skapa inte"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Använd &kataloger"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Katalogen kunde inte skapas.\n"
-"Försäkra dig om att du har skrivrättighet i dess överliggande katalog eller "
-"välj en annan, giltig, katalog."
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Fel när katalog skulle skapas"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Välj en giltig katalog."
+"Skapa samma trädstruktur som används i dokumentet för att\n"
+"lagra vyerna i målkatalogen"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"Utmatningskatalogen finns, men är inte skrivbar.\n"
-"Ställ in lämpliga rättigheter eller välj en annan katalog."
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Fel vid skrivning till utmatningskatalog"
+"Vyerna lagras i kataloger i dokumentet. Samma trädstruktur som används i "
+"dokumentet för att lagra vyerna kan skapas i den valda baskatalogen med det "
+"här alternativet.\n"
+"Bara kataloger som skapats av användaren skapas i baskatalogen (logisk vy, "
+"användningsfallsvy med flera, skapas inte)."
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 verkar inte vara en katalog. Välj en giltig katalog."
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Ändringsbarhet för roll"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Välj en giltig katalog"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Synlighet för roll"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Destinationsfilen finns redan"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Exportera"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"Filen %1 finns redan i %2.\n"
-"\n"
-"Umbrello kan skriva över filen, skapa ett liknande\n"
-"filnamn eller inte skapa den här filen."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Tillämpa för alla återstående filer"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Skriv &över"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Skapa ett liknande filnamn"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Skapa &inte en fil"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Inga alternativ tillgängliga.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Mångfald"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Skriv in mångfald:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Associationsnamn"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Skriv in associationsnamn:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rollnamn"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Skriv in rollnamn:"
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Skriv in operationsnamn:"
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Skriv in ny text:"
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "FEL"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Ändra text"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Vänsterjustera"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Högerjustera"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Justera uppåt"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nytt"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Justera nedåt"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Visa"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Justera vertikalt i mitten"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zooma:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Justera horisontellt i mitten"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kod"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Justera vertikal fördelning"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktivt &språk"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Justera horisontell fördelning"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"För justering måste du välja minst två objekt som klasser eller aktörer. Du kan "
-"inte justera associationer."
+"<p>Välkommen till Umbrello.</p>\n"
+"<p>UML-diagram låter dig konstruera och dokumentera objektorienterad "
+"programvara. <a href=\"help:/umbrello\">Umbrellos handbok</a> är en bra "
+"introduktion till användning av UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"Det här är ett reserverat nyckelord i språket som är inställt för "
-"kodgenerering."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Reserverade nyckelord"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Exporterar vy..."
+"<p>Välkommen till Umbrello 1.5. Nytt i den här versionen är "
+"associationsklasser, Ruby kodgenerering, kataloger som kan göras externa, "
+"möjlighet att ändra gränssnitt till klasser, med mera.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"Ett fel uppstod under export av bilden:\n"
+"<p>Diagram med flikar och kataloger som gjorts externa är ömsesidigt "
+"uteslutande. Om du behöver kataloger som gjorts externa avmarkera &quot;"
+"Använd diagram med flikar&quot; i Allmänna inställningar.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Den markerade filen %1 finns redan.\n"
-"Vill du skriva över den?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Filen finns redan"
+"<p>Storleken kan inte ändras för de flesta diagram, utan deras storlek "
+"ändras för att passa innehållet.\n"
+"Storleken på rutor, anteckningar och meddelanden i sekvensdiagram kan "
+"ändras. Klicka bara och dra den röda fyrkanten.</p>\n"
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "ny_aktör"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "nytt_användningsfall"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nytt_paket"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "ny_komponent"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "ny_nod"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "ny_artefakt"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nytt_gränssnitt"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "ny_datatyp"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "ny_uppräkningstyp"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nytt_objekt"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "ny_katalog"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nytt_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Tom"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Felaktigt argument"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Okänd argumenttyp"
+#: 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 ""
+"<p>Om du vill lägga till en befintlig klass i ett diagram, dra bara dess "
+"post från trädvyn.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Felaktigt metodnamn"
+#: 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 ""
+"<p> Umbrellos omflyttningsverktyg låter dig flytta operationer mellan en\n"
+"klass och dess härledda- och basklasser.\n"
+"Högerklicka på en klass för att öppna omflyttningsverktyget.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Okänd returtyp"
+#: 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 ""
+"<p>Objekt i sekvensdiagram kan ha en borttagningsruta, och ritas som "
+"aktörer. Dubbelklicka på ett för\n"
+"att se egenskapsdialogrutan.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Ospecificerat fel"
+#: 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 ""
+"<p>Sekvensdiagrammeddelanden kan fungera som konstruktorer. Klicka på "
+"objektrutan (istället för den vertikala linjen) för att göra det till en "
+"konstruktor.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Lägg till basklass"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>Sekvensdiagrammeddelanden stöder meddelanden till sig själva. Klicka på "
+"samma vertikal linje igen för att skapa ett automatiskt meddelande.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Lägg till härledd klass"
+#: 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 ""
+"<p>Om ingenting visas i listvyn när en främmande fil laddas, försök att "
+"spara modelen med ett annat namn,\n"
+"stänga, och ladda om den sparade filen. Oftast befolkas listvyn då på ett "
+"riktigt sätt.\n"
+"</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Lägg till 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 ""
+"<p>Klipp ut och kopiera exporterar också bilden som PNG till klippbordet, "
+"som kan klistras in i Kword\n"
+"och andra program.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Lägg till attribut"
+#: 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 ""
+"<p>Associationer måste inte gå i raka linjer, att dubbelklicka på en skapar "
+"en flyttbar punkt.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Lägg till basgränssnitt"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Du kan aktivera spara automatiskt i dialogrutan för inställning av "
+"Umbrello.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Lägg till härlett gränssnitt"
+#: 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 ""
+"<p>Saknas en funktion som du behöver i Umbrello? Tala gärna om det för oss.\n"
+"Lägg antingen till den i feldatabasen med Rapportera fel i hjälpmenyn\n"
+"eller skicka den till e-postlistan uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Basklassificeringar"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Du kan ta bort alla markerade objekt genom att trycka på Delete eller "
+"backsteg.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Härledda klassificeringar"
+#: 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 ""
+"<p>Om du har hittat ett fel i Umbrello, tala om det för oss.\n"
+"Du kan skicka felrapporter med felrapporteringsverktyget i hjälpmenyn.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Kan inte skapa katalog: %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 ""
+"<p>Genom att trycka på tangenten Esc, blir aktuellt verktyg "
+"markeringsverktyget.\n"
+"Backsteg går till det senast använda verktyget.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Kan inte spara ett tomt diagram"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Du kan markera alla objekt genom att trycka på Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Ett problem uppstod medan diagrammet sparades i %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 ""
+"<p>Du kan skapa och ställa in en ny klass med hjälp av guiden \"Ny klass\" i "
+"menyn Kod.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "ny_stereotyp"
diff --git a/tde-i18n-ta/messages/tdesdk/umbrello.po b/tde-i18n-ta/messages/tdesdk/umbrello.po
index e83a801def1..1ca28c14612 100644
--- a/tde-i18n-ta/messages/tdesdk/umbrello.po
+++ b/tde-i18n-ta/messages/tdesdk/umbrello.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\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-08-31 04:20-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -17,256 +17,208 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "அம்பர்லொ UML  மடுலர் ஆசிரியர்"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "திறக்க வேண்டிய கோப்பு"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2001 பால் ஹென்ஸ்கென், (c) 2002-2003 அம்பர்லொ UML  மடுலர் ஆசிரியர்கள்"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "அம்பர்லொ UML  மடுலர் ஆசிரியர்"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "கண்ணன்"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "படமாக ஏற்றுமதி செய்..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kannan_888@rediffmail.com"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr " %1 கோப்பினை சேமிப்பதில் சிக்கல் உள்ளது"
+#: 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/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 "பிழையை சேமி"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "இடதுபுறத்தை வரிசைப்படுத்து"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "பொருள்"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "வலப்புறத்தை வரிசைப்படுத்து"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "ஒத்திசைத் தகவல்"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "மேலே வரிசைப்படுத்து"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "ஒத்திசையாதச் செய்தி"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "கீழே வரிசைப்படுத்து"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "கழகம்"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "மேல்கீழ் மையத்தை வரிசைப்படுத்து"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "கொண்டவை"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "இடவல மையத்தை வரிசைப்படுத்து"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "நங்கூரம்"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "மேல்கீழ் மையத்தை வரிசைப்படுத்து"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "சிட்டை"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "இடவல மையத்தை வரிசைப்படுத்து"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "குறிப்பு"
+#: 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:253
-msgid "Box"
-msgstr "பெட்டி"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "வடிவமைத்தல்"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "நடிகர்"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "சார்புத்தன்மை"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "பொதுவாக்குதல்"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "திரட்டுதல்"
 
-#: worktoolbar.cpp:257
-#, fuzzy
-msgid "Relationship"
-msgstr "உணர்த்துதல்"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "திசைக் கழகம்"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "செய்முறைப்படுத்து(பொதுமைப்படுத்தல்/தெளிவு)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "கட்டுரையாக்கம்"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "வகுப்பு"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "தொடக்கத்தள மாநிலம்"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "முடிவு நிலை"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "கிளை/ஒன்றுசேர்ப்பு "
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Fork/சேர்"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "தொகுப்பு "
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "பொருள்கூறுகள்"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "கணு"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "சார்புத்தன்மை"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "கலைப்பொருள்"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "கழகம்"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "இடைமுகப்பு"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "சொந்தக் கழகம்"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "தகவல்வகை"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "கூட்டுமுயற்சிச் செய்தி"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "கணக்கீடு"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "வரிசை செய்தி"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-#, fuzzy
-msgid "Entity"
-msgstr "செயற்பாடின்  முடிவு"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "சொந்த இணைப்பு செய்தி"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr ""
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "வரிசை செய்தி"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "கொண்டவை"
 
-#: worktoolbar.cpp:277
-#, fuzzy
-msgid "Join"
-msgstr "Fork/சேர்"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "கட்டுரையாக்கம்"
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "சேர்/Fork"
+#: association.cpp:95
+msgid "Realization"
+msgstr "உணர்த்துதல்"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "ஓர் கழகம்"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "நங்கூரம்"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "மாநில நிலைமாற்றம்"
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "செயற்பாடு மாற்றம்"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "செயற்பாடு "
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "நிலை"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "பலவகைப்பட்ட"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "செயற்பாடின்  முடிவு"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "பலமடமாக்கத்தை உள்ளிடு:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "செயற்பாடின் தொடக்க நிலை"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "தொடர்புருவின் பெயர்"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "செய்தி"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "தொடர்புரு பெயரை உள்ளிடு: "
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "பங்கின் பெயர்"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "பெயரை உள்ளிடு: "
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
+"இந்தப் பயன்பாட்டில் இதன் பெயரும் மற்றும் கையெழுத்தும் ஏற்கனவே உள்ளன. நீங்கள் மறுபடியும் இதனைக் "
+"கூட்ட கூடாது."
 
-#: worktoolbar.cpp:302
-msgid "Select"
-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."
+msgstr "அது செல்லாத பெயர்"
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "செல்ல தகாத பெயர்"
+
+#: 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 "அந்த பெயர் முன்பெ பயன்படுத்தப்பட்டுள்ளது"
+
+#: 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 "ஒரு தனிப்பட்ட பெயரல்ல"
 
 #: 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."
+"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 ""
-"குறைந்தப்பட்சம் சித்திரப்பலகையில் ஒரு வகையாகவது ஒட்ட முடியவில்லை ஏனென்றால் அந்த "
-"வகையின் பெயர் ஏற்கனவே உள்ளது. எந்த ஒரு வகையும் ஒட்டவும்."
+"குறைந்தப்பட்சம் சித்திரப்பலகையில் ஒரு வகையாகவது ஒட்ட முடியவில்லை ஏனென்றால் அந்த வகையின் "
+"பெயர் ஏற்கனவே உள்ளது. எந்த ஒரு வகையும் ஒட்டவும்."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -277,18 +229,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"%1 கோப்பினை எழுத திறக்க முடியவில்லை.அடைவு உள்ளதா என்றும் அதில் எழுத "
-"அனுமதியுள்ளதா என்றும் உறுதிபடுத்தவும்."
+"%1 கோப்பினை எழுத திறக்க முடியவில்லை.அடைவு உள்ளதா என்றும் அதில் எழுத அனுமதியுள்ளதா "
+"என்றும் உறுதிபடுத்தவும்."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "கோப்பினை திறக்க முடியவில்லை"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"அடைவினை உருவாக்க முடியவில்லை:\n"
+msgid "Cannot create the folder:\n"
+msgstr "அடைவினை உருவாக்க முடியவில்லை:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -302,1335 +252,1551 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "அடைவினை உருவாக்க முடியவில்லை"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "மாநிலத்தின் பெயர்"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "பொது அமைப்புகள்"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "மாநிலத்தின் புதிய பெயரை பதிவு செய்வும்"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "தொகுப்பு ஒரு பெயர் இடைவெளி"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "செயல்பாட்டை இடு"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "மாய அழிவுறு"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "புதிய செயற்பாட்டின் பெயரினை உள்ளிடுக."
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "காலியான ஆக்கியை உருவாக்கு"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "புதிய செயற்பாடு"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "துணைபுரிவோனை முறையை உருவாக்கு"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-#, fuzzy
-msgid "UML Model"
-msgstr "amparlo  UML மடலர்"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "செயல்பாட்டின் உள்கோடு"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "தருக்கக் காட்சி"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "உள்வழி துணைபுரிவான்"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "கேஸ் கட்சியைப் பயன்படுத்து"
+#: codegenerators/cppcodegenerationform.cpp:57
+#, fuzzy
+msgid "Accessors are public"
+msgstr "உள்வழி துணைபுரிவான்"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "பொருள்கூறுகள் காட்டு"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "கோப்பை இறக்குகிறது: %1"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "ஓரனியை காட்டு"
+#: 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 "தயார்"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "தரவுவகை"
-
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
-"தற்போதைய கோப்பு மாற்றப்பட்டுள்ளது.\n"
-"இதை சேமிக்க வேண்டுமா?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "%1 கோப்பு பயனில் இல்லை"
+#: codeimport/import_utils.cpp:183
+#, fuzzy
+msgid "Namespace"
+msgstr "எதிர்பார்த்த இடப்பெயர்"
 
-#: 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 "பிழையை ஏற்று"
+#: 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 "வகுப்பு"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "%1 கோப்பு பழுதடைந்துள்ளது"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "அகநிலைப் பிழை"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "அழுத்தப்பட்ட கோப்பு %1ல் XMI கோப்பு இல்லை."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "'%1'  முன்னால் இலக்கணப்பிழை"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "%1 கோப்பினை ஏற்றுவதில் சிக்கலாக உள்ளது"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "'%1'  முன்னால் இலக்கண பிழை"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "%1 கோப்பினை ஏற்றுவதில் சிக்கலாக உள்ளது"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "கோப்பு %1யை மேல் ஏற்றுவதில் சிக்கல் ஏற்பட்டது"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "எதிர்பார்த்தத் தொடர் "
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "கேஸ் வரைப்படத்தை பயன்படுத்து"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "இலக்கண-பிழை அறிவிக்கப்பட்டது"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "வகுப்பு வரைப்படம் "
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "எதிர்ப்பார்த்த} "
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "தொடர் வரைப்படம் "
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "எதிர்பார்த்த இடப்பெயர்"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "கூட்டுமுயற்சி வரைப்படம் "
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "எதிர்ப்பார்த்த}"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "மநில வரைப்படம் "
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "எதிர்பார்த்த பெயர் இடப்பெயர்"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "செயற்பாடு வரைப்படம் "
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "வகை அருவி"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "பொருள்கூறு வரைப்படம் "
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "எதிர்ப்பார்த்த அறிவிப்பு"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "ஓர்வரிசை வரைப்படம் "
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "எதிர்பார்த்த மாறிலி கூற்றுகள்"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+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 "பெயர்"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "பெயரை உள்ளிடுக:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "எதிர்பார்த்த் துவக்க உறுப்பினர்"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "அது வரைப்படத்தின் மதிப்பற்ற பெயர்"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "எதிர்ப்பார்த்தத் தள வகுப்புக் குறிப்பர்"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "செல்ல தகாத பெயர்"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "எதிர்பார்த்த் துவக்கக் கூறு"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "ஏற்கனவே வேறு வரைப்படம் இந்த பெயரை பயன்படுத்துகிறது "
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+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"
-msgstr "ஒரு தனிப்பட்ட பெயரல்ல"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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."
-msgstr "அது செல்லாத பெயர்"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "அந்த பெயர் முன்பெ பயன்படுத்தப்பட்டுள்ளது"
+#: 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:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"நீங்கள் உள்ளிட்ட பெயர் தனிப்பட்டது அல்ல!\n"
-"இது நீங்கள் விரும்பியதா?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "எதிர்பார்த்தக் கூற்று"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "தனிப்படாக பெயர்"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "தொடக்கத்தியிலிருந்து எதிர்பார்த்தது "
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Use Name"
-msgstr "வகை பயன்படுத்துதல்"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "எதிர்பார்த்த பிடி"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: 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 "Enter New Name"
-msgstr "மாநிலத்தின் பெயர்"
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "வரைப்படம் %1 நீக்க வேண்டுமா?"
+msgid "Properties"
+msgstr "குணங்கள்."
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "வரைப்படத்தை நீக்கு"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "தொடக்கத்தள செயற்பாடு "
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "ஆவணத்தை அமைதிடுக"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "முடிவு செயற்பாடு "
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "கிளை/ஒன்றுசேர்ப்பு "
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML அணிகள் ஏற்றப்படுகிறது"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Fork/சேர்"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "வரைப்படம் ஏற்றப்படுகிறது"
+#: 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 "பொது"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-வரைபடங்கள்"
+#: 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 "பொது குணங்கள் "
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/தானே சேமி%1"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "செயற்பாட்டு வகை "
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "செயற்பாட்டுப் பெயர்"
 
-#: umllistview.cpp:416
-#, fuzzy
-msgid "Enter Model Name"
-msgstr "மாநிலத்தின் பெயர்"
+#: 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 "ஆவணமாக்கம் "
 
-#: umllistview.cpp:417
+#: 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 "Enter the new name of the model:"
-msgstr "செயற்பாட்டிற்கான்  புதிய பெயரை உள்ளிடுக."
+msgid "Font"
+msgstr "எழுத்துரு:"
 
-#: umllistview.cpp:1007
-msgid "Views"
-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 "எழுத்துரு அமைப்புகள்"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"நீங்கள் உள்ளிட்ட பெயர் மதிப்பற்றது!\n"
-"உருவாக்கும் படலம் ரத்து செய்யப்பட்டது."
+#: 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 "வண்ணம்"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "பெயர் செல்லாது"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "சாளர நிறம்"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"நீங்கள் உள்ளிட்ட பெயர் தனிப்பட்டது அல்ல!\n"
-"உருவாக்கும் பணி நிறுத்தப்பட்டது"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "செயற்பாடுகள்"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "புதிய செயற்பாடு"
 
-#: umllistview.cpp:2338
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid "Loading listview..."
-msgstr "வரைப்படம் ஏற்றப்படுகிறது"
+msgid "Delete"
+msgstr "நிலைப்படுத்தியை நீக்கு"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "நீக்குவதற்குமுன் கோப்புறையை முழுவதும் துடைக்க வேண்டும்"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "மறுபெயரிடு"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "அடைவு காலியாக இல்லை"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "புதிய செயற்பாடு"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"இந்தப் பயன்பாட்டில் இதன் பெயரும் மற்றும் கையெழுத்தும் ஏற்கனவே உள்ளன. நீங்கள் "
-"மறுபடியும் இதனைக் கூட்ட கூடாது."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "புதிய செயற்பாடு"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "செயல்பாட்டின் பெயரை உள்ளிடு"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "செயற்பாட்டினை மறுபெயரிடு..."
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "புதிய மாநிலம்"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "செயற்பாட்டிற்கான்  புதிய பெயரை உள்ளிடுக."
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "பொதுவாக்குதல்"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "பெயர்:"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "சொந்தக் கழகம்"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "வகை:"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "கூட்டுமுயற்சிச் செய்தி"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "கூட்டு"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "வரிசை செய்தி"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "கழகத்தின் பண்புகள்"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-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 "பொது அமைப்புகள்"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "வரிசை செய்தி"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "பங்குகள்"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "உணர்த்துதல்"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "பங்கு அமைப்புகள்"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "ஓர் கழகம்"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "கழகத்தின் எழுத்துரு"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "பங்குAகுணங்கள் "
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&வரைப்படம் "
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "பங்குbகுணங்கள் "
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&புதிய"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "பங்குa தெரியும் அளவு"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&காட்டு"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "பங்குb தெரியும் அளவு"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
-msgstr "&குறிமுறை"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "பங்குA மாற்றக்கூடிய"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
-msgstr "இயங்கு மொழி"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "பங்குb மாற்றக்கூடிய"
 
-#. 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
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "Documentation"
-msgstr "ஆவணமாக்கம் "
+msgid "Rolename:"
+msgstr "பங்குப்பெயர்:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Slash-Slash (//)"
+msgid "Multiplicity:"
+msgstr "பெருக்கல் தன்மை"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Slash-Star (/**  */)"
+msgid "Public"
+msgstr "பொது"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: 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 "Style:"
-msgstr "பாணி:"
+msgid "Private"
+msgstr "தனி"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: 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 "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ குறியீட்டு வகை</p>"
+msgid "Protected"
+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 "பொது"
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "ஆவணமாக்கம் "
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "உடல் வழிமுறை உருவாக்கம்"
+msgid "Changeable"
+msgstr "மாற்றப்பட்ட"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "தொடருவனவற்றை உருவாக்கிய குறியீட்டு வகுப்புக்கு பயன்படுத்து:"
+msgid "Frozen"
+msgstr "உறைந்த:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+msgid "Add only"
+msgstr "மட்டும் சேர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "நெறியம்"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "வகைப்பாட்டுப் பெயர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>மாறி</b>"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "நடிகர்& பெயர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "தொகுப்புப்பெயர்:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "Qஉரை"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "கேஸ் பெயரைப் பயன்படுத்து"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "சரம்"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "இடைமுக பெயர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">உரை</p>"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "பொருள்கூறுப் பெயர்:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">பட்டியல்</p>"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "ஆட்ரிபாக்ட் பெயர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "ஈனம் பெயர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>பொதுவானl?</i>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "தகவல்வகை& பெயர்:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:68
+#, fuzzy
+msgid "Entity &name:"
+msgstr "ஈனம் பெயர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "வகுப்புப் பெயர்"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "ஸ்டிரியோவகை பெயர்"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">உள்ளீட்டு கோப்புகள்</p></i>"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "தொகுப்புப்பெயர்"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "திட்டப்பணி உருவாக்கம்"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "வகுப்பு சாரம்"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "ANT கட்டுமான ஆவணத்தை உருவாக்கு"
+#: dialogs/classgenpage.cpp:123
+#, fuzzy
+msgid "A&bstract use case"
+msgstr "வகுப்பு சாரம்"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "தன் உருவாக்க வழிகள்"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "நிறைவேற்றக்கூடிய"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "ஆக்கி முறையை காலிசெய்"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "என்று வரை"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "அணுகுச் சங்க முறைகள்"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr " &முன்னிருந்த"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "ஆட்டிரிபியுட் அணுகு முறைகள்"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+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"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&நூலகம்"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&அட்டவணை"
+
+#: 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 "பொது"
 
-#. 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 "தனி"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+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"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
 msgstr "பாதுகாக்கப்பட்ட"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "மூலப்பொருளிலிருந்து"
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "ஆவண"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "ஆட்ரிபுட் ஸ்கோப்பையின் முன்னிருப்பு"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "வகுப்புப் பெயர்"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "செயல்பாடு ஸ்கோப்பின் முன்னிருப்பு"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "பெயர்"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "மூலப் பொருளிலிருந்து"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "நடிகராக ஆக வரை"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">ஜாவா குறியீடு உருவாக்கம்</p>"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "பற்பல நிகழ்வுகள்"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr ""
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "அழிப்பைக் காட்டுக"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "பொருள்கூறுப் பெயர்"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "கணுப்பெயர்:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
 msgstr ""
+"நீங்கள் தேர்வு செய்தபெயர்\n"
+"ஏற்கனவே பயன்படுத்தப்படுகிறது.\n"
+"பெயர் மாற்றப்பட்டுள்ளது"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">C++ குறியீட்டு வகை</p>"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "தனிப்பட்ட பெயர் இல்லை"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
-msgstr "கோடு உருவாக்கு விருப்பங்கள்"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "குணங்கள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "மொழி"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "புதிய குணம்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "கோப்புரை"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "இயக்கங்கள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "கோப்புரைக்கு உருவாக்கிய அனைத்து கோப்புகளையும் எழுது:"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "புதிய இயக்கம்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&தேடு..."
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "மாதிரி உருக்கள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&தேடு"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "புதிய மாதிரி உரு"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "கோப்புரையிலிருந்து தலைப்பு கோப்புகளை &உள்ளிடு:"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum  நிலையுரு"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "கோப்புகள் இயற்றியை அடைவில் குறிப்புரை இயற்றியை எழுதுக"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "புதிய Enum   நிலையுரு"
 
-#. 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"
-msgstr ""
-"இந்த அடைவைப் பயன்படுத்தி தோற்றுவிக் குறிப்புரையின் தலைப்புக் கோப்புகள்  "
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "குணங்கள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "மேலெழுது"
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "புதிய குணம்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, 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 ""
-"இந்த கோப்பின் குறிப்புரைப் பெயரில் பெயர்\n"
-"மின்னக்கி விரும்பிப் பயன்படுத்திய வெளியீடு கோப்பு ஏற்கனவே உள்ளது: "
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "நிலைப்படுத்தியை நீக்கு"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "மேலெழுது"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+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"
-msgstr "செல்லிடம் அடைவிலிருந்து வெளியேறும் தற்பொழுதுள்ள மேலெழுது கோப்புகள் "
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "காட்டு"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&கேள்"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+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"
-msgstr ""
-"இந்த கோப்பின் பெயர் ஏற்கனவே வெளியாகியுள்ளது, என்ன செய்வது என்று கேளுங்கள்"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "தெரிவது"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "வேறு பெயரை &பயன்படுத்து"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "செயல்பாடு கையொப்பம்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "தொகுப்பு"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "வடிவமைத்தல்"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "குணங்கள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "கோடுகள்"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "ஸ்டிரியோவகை"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "வரியின் முடிவுப்பாணி"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "குணங்கள் கையொப்பம்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "வரிசைபடுத்தும் வகை:"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "வட்டமாக வரை"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "வரிசைப்படுத்தும் தொகை:"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "காட்டு"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\n"
-"\")"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "காட்சி குணங்கள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"சாளரங்கள் (\"\\r\n"
-"\")"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "பண்புக்கூறு அமைவுகள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "மெக் (\"\\r\")"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "செயல்பாடு அமைவுகள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "உள்ளமைவு இல்லை"
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "மாதிரி உரு அமைவுகள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "தத்தல்"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "MIME நிலையுரு அமைவுகள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "இடைவெளி"
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "பண்புக்கூறு அமைவுகள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "அதிகமாக குறிப்பெழுது"
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+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"
-msgstr "&பிரிவுக் காலியாக இருக்கையில் கட்டளையைப் பிரிவில் எழுதுக"
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "உள்ளடக்க அமைவுகள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, 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/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "வகுப்பு அடையாளம்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&எழுதி ஆவணமாக்குதல் கருத்துரைக் காலியாக உள்ளது"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "புதிய வகுப்பு"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "புதிய வகுப்பு"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "வகுப்பு குணங்கள்"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "வகுப்பு செயல்பாடுகள்"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
+msgid "Code Generation Options"
+msgstr "கோடு உருவாக்கு விருப்பங்கள்"
+
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "உருவாக்கு"
+
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "முடி"
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "கோடு உருவாக்கப்பட்டது."
+
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "உருவாக்கப்படவில்லை "
+
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "இன்னும் உருவாக்கப்படவில்லை "
+
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
-"காலியாகயிருக்கையில் வகுப்புக்காகக் கட்டளையும் மற்றும் ஆவணமாக்குதல் முறையை எழுது"
+"கோப்பு %1 ஏற்கனவே உள்ளது.\n"
+" அதனை மேல் எழுத வேண்டுமா?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "மொழித் தேர்வுகள்"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "வெளியீடு அடைவு இல்லை"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "குறிப்பு உருவாக்க வழிகாட்டி"
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "அடைவினை உருவாக்க முடியவில்லை"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "வகுப்புக்களை தேர்ந்தெடு"
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "கோப்பினை உருவாக்கக்கூடாது."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:168
+#, fuzzy
 msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+"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 dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "குறியீடு உருவாக்கத்திற்கு வகுப்பை சேர்"
+"இந்த அடைவுத் தோன்றவில்லை.\n"
+"தயவுச் செய்து பெற்றோர் அடைவு அல்லது செல்லுபடியாகும் அடைவினை எழுதுவும்."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "தேர்ந்தெடுத்த வகுப்புகள்"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "பிழை உருவாக்கும் அடைவு"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "குறியீடு உருவாக்கத்திற்கு வகுப்பை நீக்கு"
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "தயவுச் செய்து முறையான அடைவினை தேர்ந்தெடுக்கவும்"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "வகுப்புகள் கிடைக்கும்"
+#: dialogs/codegenerationwizard.cpp:184
+#, fuzzy
+msgid ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
+msgstr ""
+"வெளியீட்டு அடைவு இருக்குகிறது, ஆனால் இதனை எழுத முடியாது.\n"
+"தயவுச் செய்து சரியான அனுமதிகள் அல்லது பிற அடைவினைத் தேர்ந்தெடுக்கவும்."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "குறியீட்டு உருவாக்கத்தின் நிலை"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "வெளியீடு அடைவில் பிழையை எழுது"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "உற்பத்திப் பொத்தானை அழுத்திக் குறியீடு உருவாக்கத்தை தொடங்கு"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 அடைவாக இல்லை. செல்லுபடியாகும் அடைவை தேர்ந்தெடுக்கவும்."
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "உருவாக்கத்தின் நிலை"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "தயவுச் செய்துச் செல்லுப்படியாகும் அடைவினை தேர்ந்தெடுக்கவும்"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
 msgid "Code Viewer"
 msgstr "கோடு பார்வையாளர்"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "மறைந்துள்ள தொகுப்புகளைக் காட்டு"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p அமைப்பு =\"மையம்\">விருப்பங்கள் இல்லை.</p>"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">இங்கு பொருள்கூறு பெயரை உள்ளிடவும்</p>"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "& வரைப்படங்கள்"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "தொகுதி முறையை காட்டு"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "வடிகட்டி"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "நிறங்கள்"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&தற்போதைய வரைபடம்"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "எழுத்துரு:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&எல்லா வரைபடங்கள்"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "காகிதம்:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&வரைபடத்தை தேர்ந்தெடு"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "தேர்ந்தெடுத்த"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "வரைபட வகைகள்"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML பொருள் தொகுதி:</p>"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "தேர்வு"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">தொகுதியை மறை:</p>"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "வகை பயன்படுத்துதல்"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">திருத்தமுடியாத உரை:</p>"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "கூட்டுமுயற்சி"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">திருத்தமுடிந்த உரை</p>"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "வரிசை"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "வரிப்பட குணங்கள்"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "நிலை"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "பெயர்:"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "பொருள்கூறுகள்"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "பெரிதாக்கு:"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "ஒரே வரிசையில் நிறுத்துதல்"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-வரைபடங்கள்"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
-msgstr "செயல்பாட்டு கையொப்பத்தை காட்டு"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "வரைபடம் எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Show &grid"
-msgstr "க்ட்டத்தை காட்டு"
+msgid "The format that the images will be exported to"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "கட்டத்துக்கு இழுத்துச் செல்"
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "ஆவணத்தை குறிப்பெடு"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "செயற்கூறு அளவை திணி"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "சேரும் கோப்பு ஏற்கனவே இருக்கிறது."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:31
 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."
+"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 ""
-"பல கட்ட இடத்திற்காக பொருள்கூறின் அளவை சுருக்கு.\n"
-"'கட்டத்துடன் சேர்'  பொருள்கூற்றை செயலாக்கிவிட்டது என்றால் 4 பக்கமும் கட்டங்களாக "
-"அமைக்கப்படும்."
+"%1 கோப்பு ஏற்கனவே %2 இல் இருக்கிறது. அம்பிரல்லொ அந்த கோப்பினை மேலெழுதலாம். இதே "
+"கோப்பினையோ அல்லது வேறொரு இதனைப் போன்ற கோப்பினை உருவாக்கவும்."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "கட்ட இடைவெளி:  "
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "மீதமுள்ள எல்லா கோப்புகளுக்கும் விண்ணப்பிக்கவும்"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "மேல் எழுது"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "இதைப்போன்ற வேறொரு கோப்பு பெயரினை உருவாக்கவும்."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "கோட்டின் அகலம்:"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "கோப்பினை உருவாக்கக்கூடாது."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "படமாக ஏற்றுமதி செய்..."
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "அளவுரு குணங்கள்"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+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/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "பெயர்:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "துவக்கு மதிப்பு"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "திசையை செலுத்துதல்"
+
+#: dialogs/parmpropdlg.cpp:84
+msgid ""
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
+"\"உள்ளே\" என்பது படிக்கமட்டும் அளபுரு, \"வெளியே\" என்பது எழுத மட்டும் உள்ள அளபுரு "
+"மற்றும்\"உள்ளே வெளியே\" என்பது படித்தல் மற்றும் எழுதுதலுக்கான அளபுரு."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "நிலையின் வகை"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "செயல் தேர்ந்தெடு"
+
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "தொடர் எண்"
+
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "வகுப்பு செயல்பாடு:"
+
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "வழக்க செயல்பாடு:"
+
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr " Umbrello அமைத்தல்"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "பயனீட்டாளர் இடைமுகம்"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "பயன்படுத்துவோர் இடைமுக அமைப்புகளை"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "கோடுக்கான வண்ணம் "
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "முன்னிருப்பு வண்ணம்"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "வண்ணம் நிரப்பு"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "முன்னிருப்புநிறம்"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "கோட்டின் அகலம்:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "&முன்னிருப்பு அகலம்"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "வண்ணம் நிரப்பை உபயோகி"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "அடைவு"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "மீட்டு செயல்படுத்து"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "மநில வரைப்படம் "
+
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "செயல்பாடு ஸ்கோப்பின் முன்னிருப்பு"
+
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "தானே சேமி"
+
+#: 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 ""
-"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)."
+"<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/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "செயல் குணங்கள்"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "ஆரம்பி"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "பங்குப்பெயர்:"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "ஆரம்பச் சின்னம்"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "பெருக்கல் தன்மை"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&இந்த நாளுக்கான யோசனை"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "பங்கு மாற்றும்"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "இறுதி திட்டத்தை ஏற்று"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "மட்டும் சேர்"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "புது பிராஜக்டை இதனுடன் துவக்கு"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "உறைந்த:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "வரைபடம் இல்லை"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "மாற்றப்பட்ட"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "வகுப்பு வரைபடம்"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "கேஸ் வரிப்படத்தை பயன்படுத்து"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "வரிசை வரைபடம் "
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "கூட்டுமுயற்சி வரைப்படம்"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "வரைபடத்தை சுட்டு"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "செயல்படு வரைப்படம்"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "செயல்கூறு வரைப்படம்"
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "ஓரனி வரைப்படம்"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "வகுப்பு அமைப்புகள்"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "காட்சியை காட்டு"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "குணங்களைக் காட்டு"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "செயல்பாடுகளைக்காட்டு"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "ஸ்டிரியோ வகைவை காட்டு"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "ஆட்ரிபுட் கையொப்பத்தை காட்டு"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "தொகுப்பை காட்டு"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
-msgid "Role Visibility"
-msgstr "தெரியும் பங்கு"
+msgid "Show operation signature"
+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 "ஆவணமாக்கம் "
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+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"
-msgstr ""
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "ஆட்ரிபுட் ஸ்கோப்பை முன்னிருப்பு"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "செயல்பாடு  ஸ்கோப்பின் முன்னிருப்பு"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "குறிப்புறை உருவாக்கம்"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "குறிப்புறை உருவாக்க அமைவுகள்"
 
-#: tips.txt:19
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "குறிப்புறை கட்சியக அமைவுகள்"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "துவக்க நிலை"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "முடிவு நிலை"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "நிலையின் வகை"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "நிலையின் பெயர்."
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "சாளர வண்ணம்"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "பண்பு குணங்கள்"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "பிரிப்பவர் மற்றும் நோக்கு (\"static\")"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "பொது"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "பாதுகாக்கப்பட்ட"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
 #, fuzzy
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>பல வரைப்படம் வகையின் அளவை மாற்ற இயலாது, பிறகு அவை தானாக தொகுப்பில் சேமித்து "
-"வைத்து கொள்ளும்.\n"
-"பெட்டிகள், குறிப்பு மற்றும் செய்தி வரைப்படத்தின் தகவல் அளவை மாற்ற இயலும். "
-"சிகப்பு சதுரத்தில் சொடுக்கி மற்றும் அழுத்தவும்.</p>\n"
+msgid "I&mplementation"
+msgstr "ஆவண"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "தாங்கள் ஒரு செல்லாத பண்பு பெயரை உள்ளிட்டுள்ளீர்கள்"
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "பண்புக்கூறுப் பெயர் செல்லத்தக்கதாக இல்லை"
 
-#: tips.txt:25
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
-"<p>வரைபடத்திற்கு ஏற்கனவே இருக்கும் வகுப்பை நீங்கள் சேர்க்க விரும்புகிறீர் "
-"என்றால் மர பார்வையில் இருந்து உள்ளிட்டை எடுக்கவும்.</p>\n"
+"தாங்கள் தேர்வு செய்த பண்புகூறு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு வருகிறது"
 
-#: tips.txt:30
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "பண்புக்கூறுப் பெயர் தனிப்பட்டதாக இல்லை"
+
+#: dialogs/umlentityattributedialog.cpp:43
 #, fuzzy
-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"
+msgid "Entity Attribute Properties"
+msgstr "பண்பு குணங்கள்"
+
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr " &முன்னிருந்த"
+
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
-"<p>Umbrello's புதிய தரகர் மீண்டும் உருவாக்கில் அடித்தல் மற்றும் வகுக்கப்பட்ட "
-"வகுப்புகளில் செயல்களை \n"
-"இடமாற்றலாம்.\n"
-"தரகர் மீண்டும் உருவாக்கில் திறக்க வகுப்புகளை வலது சொடுக்கவும்.</p>\n"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 msgstr ""
-"<p>வரிசை பட பொருள் அழிப்பெட்டியை வைத்து கொள்ளலாம் மற்றும் நடிகனாக வரையலாம். "
-"பண்பு உரையாடலுக்காக\n"
-"இருமுறை சொடுக்கவும்.</p>\n"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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/umlentityattributedialog.cpp:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "குணங்கள்"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 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"
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "&புதிய"
+
+#: dialogs/umlentityattributedialog.cpp:115
+#, fuzzy
+msgid "&Primary"
+msgstr "&நூலகம்"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 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"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
 msgstr ""
-"<p>வெட்டி மற்றும் ஒட்டியும் தோற்றத்திலிருந்து PNG இடைநிலைபலகையின் KWord\n"
-"மற்றும் பிற பயன்பாட்டில் ஒட்டவும்.</p>\n"
 
-#: tips.txt:66
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+msgstr "தாங்கள் ஒரு செல்லாத பண்பு பெயரை உள்ளிட்டுள்ளீர்கள்"
+
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "பண்புக்கூறுப் பெயர் செல்லத்தக்கதாக இல்லை"
+
+#: dialogs/umlentityattributedialog.cpp:192
 #, fuzzy
 msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>சங்கங்கள் நேர்கோட்டினையும், இரண்டுச் செடுக்கையும் பயன்படுத்தி நகற்றும்\n"
-"புள்ளியை உருவாக்க விரும்பவில்லை.</p>\n"
+"தாங்கள் தேர்வு செய்த பண்புகூறு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு வருகிறது"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+#, fuzzy
+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 ""
-"<p>நீங்கள் உள்ளமை ஆம்பர்லா உரையாடலைத் தானாகச் சேமிக்கவும்.</p>\n"
 
-#: tips.txt:76
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "அளவுருக்கள்"
+
+#: 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 ""
-"<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"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Umbrelloக்கு தேவையான ஒரு வசதி குறைகிறதா? எங்களுக்கு தெரிவியுங்கள். \n"
-"ஒன்று உதவி பட்டியின் அறிக்கை பிழையுடன் பிழை தரவுடன் சேர்க்கவும் \n"
-"அல்லது uml-devel கடித பட்டிக்கு அனுப்பவும்.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+"தாங்கள் தேர்வு செய்த அளவுரு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு வருகிறது."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "அளவுரு பெயர் தனிப்பட்டதாக இல்லை."
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
-"<p>நீங்கள் எல்லாப் பொருளையும் அழிக்க விரும்பினால் அழி அல்லது பின் இடம் பொத்தனை "
-"அழுத்தவும்.</p>\n"
+"தாங்கள் தேர்வு செய்த அளவுரு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு வருகிறது."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "தாங்கள் ஒரு செல்லாத செயற்பாட்டு பெயரினை உள்ளிட்டுள்ளீர்கள்"
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "செல்லாத செயற்பாட்டுப் பெயர்"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "அந்த கையெழுத்தைக் கொண்ட செயற்பாடு ஏற்கனவே %1 இல் இருக்கிறது.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "அளவுரு பட்டியலுக்கு வேறொரு பெயரை தேர்ந்தெடுக்கவும்."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "செயல் குணங்கள்"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "மாதிரி உரு குணங்கள்"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "நீங்கள் உள்ளிட்ட பெயர் மதிப்பில்லா மாதிரி உரு "
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "மாதிரி உரு பெயர் மதிப்பில்லாதது"
 
-#: tips.txt:91
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
 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"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Umbrelloவில் பிழை கண்டுபிடித்தால், எங்களுக்கு தெரிவியுங்கள். \n"
-"உதவி பட்டியின் அறிக்கை பிழை கருவியுடன் பிழை தரவுடன் நீங்கள் சேர்த்து "
-"அனுப்பவும்.</p>\n"
+"தாங்கள் தேர்வு செய்த அளவுரு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு வருகிறது."
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "அளவுரு பெயர் தனிப்பட்டதாக இல்லை."
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "வகுப்பு காட்சி தேர்வுகள்"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "வரிப்பட வண்ணங்கள்"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "தங்கள் உள்ளிட்ட பெயர் செல்ல தகாதது."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "தங்கள் உள்ளிட்ட "
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "தனிப்படாக பெயர்"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "வரி"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "நிரப்பு"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "முன்னிருந்த"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "நிரப்பு பயன்படுத்து"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "படமாக ஏற்றுமதி செய்..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p>பொத்தனை அழுத்தித் தப்புதல் விசையை அமைத்து தற்போதைய கருவியிலிருந்து கருவியைத் "
-"தேர்ந்தெடுக்கவும்\n"
-"பின்னிருந்து முன்னுக்கு செல்லக் கருவிப் பயன்படுத்துக.</p>\n"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</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 " %1 கோப்பினை சேமிப்பதில் சிக்கல் உள்ளது"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "பிழையை சேமி"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "அம்பர்லொ UML  மடுலர் ஆசிரியர்"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "திறக்க வேண்டிய கோப்பு"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>எல்லாப் பொருளையும் தேர்ந்தெடுக்க Ctrl-A என்று அழுத்துவும்.</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>புதிய வகுப்பு வழிகாட்டியின் குறிப்பொறைப் பட்டியலைப் பயன்படுத்தி நீங்கள் "
-"புதிய வகுப்பு உருவாக்கு மற்றும் மேலமைக்கவும்.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 பால் ஹென்ஸ்கென், (c) 2002-2003 அம்பர்லொ UML  மடுலர் ஆசிரியர்கள்"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "அம்பர்லொ UML  மடுலர் ஆசிரியர்"
+
+#: 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 "பெயர்"
+
+#: 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 "பெயரை உள்ளிடுக:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "செயல்பாடு பெயரை உள்ளிடு: "
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "புதிய உரையை பதிவு செய்யவும் "
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "பிழை"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "உரையை மாற்று "
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "%1 கோப்பு பயனில் இல்லை"
+
+#: 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 "பிழையை ஏற்று"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "%1 கோப்பு பழுதடைந்துள்ளது"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1687,6 +1853,10 @@ msgstr "புதிய செயல் ..."
 msgid "Select Operation..."
 msgstr "செயலை தேர்ந்தெடு..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "உரையை மாற்று."
@@ -1738,6 +1908,19 @@ msgstr "புதிய"
 msgid "Rename..."
 msgstr "மறுபெயரிடு..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "பிழையை ஒட்டு"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "கோடுக்கான வண்ணம்..."
@@ -1768,14 +1951,26 @@ msgstr "அகநிலைப் பிழை"
 msgid "Import Classes..."
 msgstr "&C++ வகுப்புகளை இறக்கு..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "தொகுப்பு "
+
 #: 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 "கணு"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "&தற்போதைய வரைபடம்"
@@ -1784,11 +1979,20 @@ msgstr "&தற்போதைய வரைபடம்"
 msgid "Folder"
 msgstr "அடைவு"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "செயற்பாடின்  முடிவு"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 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 "நிலைவரைபடத்தை பயன்படுத்து..."
@@ -1826,6 +2030,18 @@ msgstr "புதிய குணங்கள்..."
 msgid "Export as Picture..."
 msgstr "படமாக ஏற்றுமதி செய்..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "இடைமுகப்பு"
+
+#: 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 "வரைப்படத்தின் வகுப்பு "
@@ -1846,26 +2062,10 @@ msgstr "வரிசை வரைபடம் "
 msgid "Collaboration Diagram..."
 msgstr "வீழ்ச்சி வரைபடம் "
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "குணங்கள்"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "இயக்கங்கள்"
-
 #: 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 "செயல்பாட்டு கையெழுத்து"
@@ -1878,11 +2078,6 @@ msgstr "கையெழுத்து குணங்கள்"
 msgid "Stereotype"
 msgstr "ஸ்டீரியோ வகை"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "காட்டு"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "பண்பு..."
@@ -1907,14 +2102,6 @@ msgstr "வண்ணம் நிரப்பு..."
 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 "வண்ணம்"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "நடிகர்..."
@@ -1943,10 +2130,26 @@ msgstr "கணக்கீடு..."
 msgid "Package..."
 msgstr "பணித்தொகுப்பு"
 
+#: 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 "நிலை"
 
+#: 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..."
@@ -1994,6 +2197,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 "தெளிவான வரைபடம் "
@@ -2028,199 +2239,105 @@ 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
 #, fuzzy
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr ""
-"(c) 2001 பால் ஹென்ஸ்கென், (c) 2002-2003 அம்பர்லொ UML  மடுலர் ஆசிரியர்கள்"
+msgstr "(c) 2001 பால் ஹென்ஸ்கென், (c) 2002-2003 அம்பர்லொ UML  மடுலர் ஆசிரியர்கள்"
 
-#: 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
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "%1 கோப்பு பயனில் இல்லை"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "புது_நடிகன்"
 
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "%1 கோப்பு பழுதடைந்துள்ளது"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "புது_கெஸ் உபயோகி"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "கண்ணன்"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "புது_பணித்தொகுப்பு "
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kannan_888@rediffmail.com"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "புது_பகுதிகள்"
 
-#: 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 "தயார்"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "புது_முனை"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
+#: model_utils.cpp:254
+msgid "new_artifact"
+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 ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "புது_இடைமுகம் "
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr ""
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "புது_தரவு இனம் "
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "புது_ஈனம்"
 
-#: codeimport/import_utils.cpp:183
+#: model_utils.cpp:262
 #, fuzzy
-msgid "Namespace"
-msgstr "எதிர்பார்த்த இடப்பெயர்"
+msgid "new_entity"
+msgstr "புது_ஈனம்"
 
-#: codeimport/classimport.cpp:34
+#: model_utils.cpp:264
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "கோப்பை இறக்குகிறது: %1"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "அகநிலைப் பிழை"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "'%1'  முன்னால் இலக்கணப்பிழை"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "'%1'  முன்னால் இலக்கண பிழை"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "எதிர்பார்த்தத் தொடர் "
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "இலக்கண-பிழை அறிவிக்கப்பட்டது"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "எதிர்ப்பார்த்த} "
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "எதிர்பார்த்த இடப்பெயர்"
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "எதிர்ப்பார்த்த}"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "எதிர்பார்த்த பெயர் இடப்பெயர்"
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "வகை அருவி"
-
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "எதிர்ப்பார்த்த அறிவிப்பு"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "எதிர்பார்த்த மாறிலி கூற்றுகள்"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "எதிர்பார்த்த')'"
+msgid "new_folder"
+msgstr "புது_முனை"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} இல்லை"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "புது_கழகம்"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "எதிர்பார்த்த் துவக்க உறுப்பினர்"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "புது_பொருள்"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "எதிர்ப்பார்த்தத் தள வகுப்புக் குறிப்பர்"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "எதிர்பார்த்த் துவக்கக் கூறு"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "எதிர்பார்த்த அடையாளம்"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "எதிர்பார்த்த அடையாள வகை"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "எதிர்ப்பார்த்த வகுப்புப் பெயர்"
+#: 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"
-msgstr "எதிர்பார்த்தக் கட்டளை"
+#: 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"
-msgstr "எதிர்பார்த்தக் கூற்று"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "தொடக்கத்தியிலிருந்து எதிர்பார்த்தது "
+#: 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"
-msgstr "எதிர்பார்த்த பிடி"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "விசைப்பலகை ஒதுக்கப்பட்டது"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2234,109 +2351,66 @@ msgstr "பொருளின்  பெயரை பதிவு செய்�
 msgid "new_parameter"
 msgstr "புதிய_அளவுரு"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "பொது அமைப்புகள்"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "தொகுப்பு ஒரு பெயர் இடைவெளி"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "தளத்தின் வகுப்பை கூட்டு "
 
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "மாய அழிவுறு"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "பெறுதல் வகுப்புகளை சேர்"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "காலியான ஆக்கியை உருவாக்கு"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "செயற்பாட்டை கூட்டவும்"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "துணைபுரிவோனை முறையை உருவாக்கு"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "பண்புக்கூறு  கூட்டவும்"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "செயல்பாட்டின் உள்கோடு"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "தள இடைமூலத்தை சேர்"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "உள்வழி துணைபுரிவான்"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "பெறுதல் இடைமுகப்பை சேர்"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-#, fuzzy
-msgid "Accessors are public"
-msgstr "உள்வழி துணைபுரிவான்"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "தளத்தை வகைப்படுத்தல்"
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "வரைப்படம்:%2 பக்கம் %1"
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "பெற்ற வகைப்படுத்தி   "
 
-#: umlview.cpp:2578
-#, fuzzy
-msgid "Enter Diagram Name"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
 msgstr "மாநிலத்தின் பெயர்"
 
-#: umlview.cpp:2579
-#, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "செயற்பாட்டிற்கான்  புதிய பெயரை உள்ளிடுக."
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"முழு வடிவத்தையும் அழிக்க விரும்புகிறீர்களா.\n"
-"கண்டிப்பாக?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "வரைப்படத்தை நீக்கு "
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr ""
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr ""
-
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"உள்ளிட்ட பெயர் மதிப்பற்றது!\n"
-"மாற்றுப்பெயர் கொடுப்பது விடப்பட்டது"
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "புது_கழகம்"
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "புது_கூறு "
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "மாநிலத்தின் புதிய பெயரை பதிவு செய்வும்"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "புதிய_மாதிரி உரு"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "செயல்பாட்டை இடு"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "புது_ செயல்"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "தொடர்புப் பயன்பாட்டில் தவறு"
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "புது_நிலையுரு "
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "தொடர்பு பிழை"
 
-#: umlcanvasobject.cpp:162
-#, fuzzy
-msgid "new_field"
-msgstr "புது_நிலையுரு "
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "புதிய மாநிலம்"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2493,11 +2567,6 @@ msgstr "படமாக ஏற்றுமதி செய்"
 msgid "Export &All Diagrams as Pictures..."
 msgstr "படமாக ஏற்றுமதி செய்..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "குணங்கள்."
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "ஸ்லைடரைப் பெரிதாக்கு"
@@ -2584,6 +2653,13 @@ msgstr "ஆவண"
 msgid "Opening file..."
 msgstr "கோப்பினைத் திறக்கையில் "
 
+#: 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 "புதிய ஆவணத்தை உருவாக்குதல்"
@@ -2591,15 +2667,15 @@ msgstr "புதிய ஆவணத்தை உருவாக்குதல�
 #: uml.cpp:673
 #, fuzzy
 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|All Supported Files (*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2)\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)"
@@ -2628,6 +2704,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
 "*|All Files"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2636,6 +2716,10 @@ msgstr ""
 "%1 கோப்பு ஏற்கனவே உள்ளது \n"
 "அதன் மேல் எழுத வேண்டுமா?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2672,11 +2756,11 @@ msgstr "இடைநிலைப் பலகை உள்ளடக்கங்�
 
 #: 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
 msgid "Toggling toolbar..."
@@ -2734,1293 +2818,1294 @@ msgstr ""
 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:"
-msgstr "பொருள்கூறுப் பெயர்:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "புது_கூறு "
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "ஆட்ரிபாக்ட் பெயர்"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "புதிய_மாதிரி உரு"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "ஈனம் பெயர்"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "புது_ செயல்"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "தகவல்வகை& பெயர்:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "புது_நிலையுரு "
 
-#: dialogs/classgenpage.cpp:68
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Entity &name:"
-msgstr "ஈனம் பெயர்"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "ஸ்டிரியோவகை பெயர்"
-
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "தொகுப்புப்பெயர்"
-
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "வகுப்பு சாரம்"
+msgid "new_field"
+msgstr "புது_நிலையுரு "
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "வகுப்பு சாரம்"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "நிறைவேற்றக்கூடிய"
+msgid "UML Model"
+msgstr "amparlo  UML மடலர்"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "என்று வரை"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "தருக்கக் காட்சி"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr " &முன்னிருந்த"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "கேஸ் கட்சியைப் பயன்படுத்து"
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&நூலகம்"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "பொருள்கூறுகள் காட்டு"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&அட்டவணை"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "ஓரனியை காட்டு"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "பொது"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "தனியார்"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "தரவுவகை"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "பாதுகாக்கப்பட்ட"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"தற்போதைய கோப்பு மாற்றப்பட்டுள்ளது.\n"
+"இதை சேமிக்க வேண்டுமா?"
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "ஆவண"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "%1 கோப்பு பயனில் இல்லை"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "வகுப்புப் பெயர்"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "%1 கோப்பு பழுதடைந்துள்ளது"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "பெயர்"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "அழுத்தப்பட்ட கோப்பு %1ல் XMI கோப்பு இல்லை."
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "நடிகராக ஆக வரை"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "%1 கோப்பினை ஏற்றுவதில் சிக்கலாக உள்ளது"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "பற்பல நிகழ்வுகள்"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "%1 கோப்பினை ஏற்றுவதில் சிக்கலாக உள்ளது"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "அழிப்பைக் காட்டுக"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "கோப்பு %1யை மேல் ஏற்றுவதில் சிக்கல் ஏற்பட்டது"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "பொருள்கூறுப் பெயர்"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "கேஸ் வரைப்படத்தை பயன்படுத்து"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "கணுப்பெயர்:"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "வகுப்பு வரைப்படம் "
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "ஸ்டிரியோவகைப்பெயர்:"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+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."
-msgstr ""
-"நீங்கள் தேர்வு செய்தபெயர்\n"
-"ஏற்கனவே பயன்படுத்தப்படுகிறது.\n"
-"பெயர் மாற்றப்பட்டுள்ளது"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "கூட்டுமுயற்சி வரைப்படம் "
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "தனிப்பட்ட பெயர் இல்லை"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "மநில வரைப்படம் "
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "வரி"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "செயற்பாடு வரைப்படம் "
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "நிரப்பு"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "பொருள்கூறு வரைப்படம் "
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "முன்னிருந்த"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "ஓர்வரிசை வரைப்படம் "
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "நிரப்பு பயன்படுத்து"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "செயற்பாடுகள்"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "அது வரைப்படத்தின் மதிப்பற்ற பெயர்"
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "புதிய செயற்பாடு"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "ஏற்கனவே வேறு வரைப்படம் இந்த பெயரை பயன்படுத்துகிறது "
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "மறுபெயரிடு"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"நீங்கள் உள்ளிட்ட பெயர் தனிப்பட்டது அல்ல!\n"
+"இது நீங்கள் விரும்பியதா?"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "புதிய செயற்பாடு"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "வகை பயன்படுத்துதல்"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "செயற்பாட்டினை மறுபெயரிடு..."
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "மாநிலத்தின் பெயர்"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "செயற்பாட்டிற்கான்  புதிய பெயரை உள்ளிடுக."
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "வரைப்படம் %1 நீக்க வேண்டுமா?"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "கழகத்தின் பண்புகள்"
+#: umldoc.cpp:1099
+msgid "Delete 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 "பொது அமைப்புகள்"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "ஆவணத்தை அமைதிடுக"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "பங்குகள்"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "பங்கு அமைப்புகள்"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML அணிகள் ஏற்றப்படுகிறது"
 
-#: 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 "எழுத்துரு அமைப்புகள்"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "வரைப்படம் ஏற்றப்படுகிறது"
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "கழகத்தின் எழுத்துரு"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/தானே சேமி%1"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "மாதிரி உரு குணங்கள்"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+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 "பொது குணங்கள் "
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "மாநிலத்தின் பெயர்"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "வகை:"
+#: umllistview.cpp:417
+#, fuzzy
+msgid "Enter the new name of the model:"
+msgstr "செயற்பாட்டிற்கான்  புதிய பெயரை உள்ளிடுக."
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "பெயர்:"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "எண்ணங்கள்"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "நீங்கள் உள்ளிட்ட பெயர் மதிப்பில்லா மாதிரி உரு "
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"நீங்கள் உள்ளிட்ட பெயர் மதிப்பற்றது!\n"
+"உருவாக்கும் படலம் ரத்து செய்யப்பட்டது."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "மாதிரி உரு பெயர் மதிப்பில்லாதது"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "பெயர் செல்லாது"
 
-#: dialogs/umltemplatedialog.cpp:138
-#, fuzzy
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
-"தாங்கள் தேர்வு செய்த அளவுரு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு "
-"வருகிறது."
+"நீங்கள் உள்ளிட்ட பெயர் தனிப்பட்டது அல்ல!\n"
+"உருவாக்கும் பணி நிறுத்தப்பட்டது"
 
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "அளவுரு பெயர் தனிப்பட்டதாக இல்லை."
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "பண்பு குணங்கள்"
+msgid "Loading listview..."
+msgstr "வரைப்படம் ஏற்றப்படுகிறது"
 
-#: dialogs/umlentityattributedialog.cpp:73
-#, fuzzy
-msgid "&Default value:"
-msgstr " &முன்னிருந்த"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "நீக்குவதற்குமுன் கோப்புறையை முழுவதும் துடைக்க வேண்டும்"
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr ""
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "அடைவு காலியாக இல்லை"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-#, fuzzy
-msgid "Attributes:"
-msgstr "குணங்கள்"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-#, fuzzy
-msgid "&None"
-msgstr "&புதிய"
-
-#: dialogs/umlentityattributedialog.cpp:115
-#, fuzzy
-msgid "&Primary"
-msgstr "&நூலகம்"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
+"உள்ளிட்ட பெயர் மதிப்பற்றது!\n"
+"மாற்றுப்பெயர் கொடுப்பது விடப்பட்டது"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr ""
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "வரைப்படம்:%2 பக்கம் %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
+#: umlview.cpp:2578
 #, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "தாங்கள் ஒரு செல்லாத பண்பு பெயரை உள்ளிட்டுள்ளீர்கள்"
+msgid "Enter Diagram Name"
+msgstr "மாநிலத்தின் பெயர்"
 
-#: dialogs/umlentityattributedialog.cpp:185
+#: umlview.cpp:2579
 #, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "பண்புக்கூறுப் பெயர் செல்லத்தக்கதாக இல்லை"
+msgid "Enter the new name of the diagram:"
+msgstr "செயற்பாட்டிற்கான்  புதிய பெயரை உள்ளிடுக."
 
-#: dialogs/umlentityattributedialog.cpp:192
-#, fuzzy
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"தாங்கள் தேர்வு செய்த பண்புகூறு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் "
-"உப்யோகிக்கப்பட்டு வருகிறது"
+"முழு வடிவத்தையும் அழிக்க விரும்புகிறீர்களா.\n"
+"கண்டிப்பாக?"
 
-#: dialogs/umlentityattributedialog.cpp:193
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "வரைப்படத்தை நீக்கு "
+
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "பண்புக்கூறுப் பெயர் தனிப்பட்டதாக இல்லை"
+msgid "Exporting view..."
+msgstr "வெளியேறுகிறது"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "காட்டு"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "வகுப்பு காட்சி தேர்வுகள்"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"கோப்பு %1 ஏற்கனவே உள்ளது.\n"
+"அதனை மேல் எழுத வேண்டுமா?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "வரிப்பட வண்ணங்கள்"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "கோப்பு முன்பே உள்ளது"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "தங்கள் உள்ளிட்ட பெயர் செல்ல தகாதது."
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "அடைவினை உருவாக்க முடியவில்லை"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "தங்கள் உள்ளிட்ட "
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "காலியான வரைபடத்தை சேமிக்க இயலாது"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "வகை:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr " Umbrello அமைத்தல்"
+#: 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:47
-msgid "User Interface"
-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 ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "பயன்படுத்துவோர் இடைமுக அமைப்புகளை"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "பொருள்"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "கோடுக்கான வண்ணம் "
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "ஒத்திசைத் தகவல்"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "முன்னிருப்பு வண்ணம்"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "ஒத்திசையாதச் செய்தி"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "வண்ணம் நிரப்பு"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "சிட்டை"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "முன்னிருப்புநிறம்"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "குறிப்பு"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "கோட்டின் அகலம்:"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "பெட்டி"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "&முன்னிருப்பு அகலம்"
+#: worktoolbar.cpp:257
+#, fuzzy
+msgid "Relationship"
+msgstr "உணர்த்துதல்"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "வண்ணம் நிரப்பை உபயோகி"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "திசைக் கழகம்"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "மீட்டு செயல்படுத்து"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "செய்முறைப்படுத்து(பொதுமைப்படுத்தல்/தெளிவு)"
 
-#: dialogs/settingsdlg.cpp:112
-#, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "மநில வரைப்படம் "
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "செயல்பாடு ஸ்கோப்பின் முன்னிருப்பு"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "தானே சேமி"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "தானாகவே சேர்வதை செயல்படுத்து"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "தானியங்கு நேர இடைவெளியை தேர்வு செய்(நிமிடங்கள்):"
+msgid "Join"
+msgstr "Fork/சேர்"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "தானாக சேமிக்கும் பின்னொட்டை அமை"
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "சேர்/Fork"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "ஆரம்பி"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "ஆரம்பச் சின்னம்"
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "செயற்பாடு மாற்றம்"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&இந்த நாளுக்கான யோசனை"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "செய்தி"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "இறுதி திட்டத்தை ஏற்று"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "புது பிராஜக்டை இதனுடன் துவக்கு"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "தேர்வு"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "வரைபடம் இல்லை"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "வகுப்பு வரைபடம்"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "கேஸ் வரிப்படத்தை பயன்படுத்து"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "வரிசை வரைபடம் "
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "கூட்டுமுயற்சி வரைப்படம்"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "செயல்பாடுகளைக்காட்டு"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "வரைபடத்தை சுட்டு"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "செயல்படு வரைப்படம்"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "தெளிவான வரைபடம் "
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "செயல்கூறு வரைப்படம்"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "ஓரனி வரைப்படம்"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "பொதுவாக்குதல்"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "வகுப்பு அமைப்புகள்"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "காட்சியை காட்டு"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "குணங்களைக் காட்டு"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "தொடர்புருவின் பெயர்"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "செயல்பாடுகளைக்காட்டு"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "ஸ்டிரியோ வகைவை காட்டு"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "ஆட்ரிபுட் கையொப்பத்தை காட்டு"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "தொகுப்பை காட்டு"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr " &முன்னிருந்த"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "வரையெல்லை ஆரம்பம்"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "ஆட்ரிபுட் ஸ்கோப்பை முன்னிருப்பு"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Slash-Slash (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "செயல்பாடு  ஸ்கோப்பின் முன்னிருப்பு"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Slash-Star (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "குறிப்புறை உருவாக்கம்"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "பாணி:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "குறிப்புறை உருவாக்க அமைவுகள்"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ குறியீட்டு வகை</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "குறிப்புறை கட்சியக அமைவுகள்"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "உடல் வழிமுறை உருவாக்கம்"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "செயற்பாட்டு குணங்கள்"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "தொடருவனவற்றை உருவாக்கிய குறியீட்டு வகுப்புக்கு பயன்படுத்து:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "கருத்தியல் செயல்"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "பிரிப்பவர் மற்றும் நோக்கு (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "நெறியம்"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>மாறி</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "பாதுகாக்கப்பட்ட"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "ஆவண"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "Qஉரை"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "அளவுருக்கள்"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "சரம்"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "புதிய அளவுரு"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">உரை</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "தங்கள் ஒரு செல்லாத அளவுரு பெயரினை உள்ளிட்டு இருக்கிறீர்கள்."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">பட்டியல்</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "அளவுரு பெயர் செல்லத்தகாது"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"தாங்கள் தேர்வு செய்த அளவுரு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு "
-"வருகிறது."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>பொதுவானl?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "அளவுரு பெயர் தனிப்பட்டதாக இல்லை."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr ""
-"தாங்கள் தேர்வு செய்த அளவுரு பெயர் ஏற்கனவே இந்த செயற்பாட்டில் உப்யோகிக்கப்பட்டு "
-"வருகிறது."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "வகுப்புப் பெயர்"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "தாங்கள் ஒரு செல்லாத செயற்பாட்டு பெயரினை உள்ளிட்டுள்ளீர்கள்"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">உள்ளீட்டு கோப்புகள்</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "செல்லாத செயற்பாட்டுப் பெயர்"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "திட்டப்பணி உருவாக்கம்"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"அந்த கையெழுத்தைக் கொண்ட செயற்பாடு ஏற்கனவே %1 இல் இருக்கிறது.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "ANT கட்டுமான ஆவணத்தை உருவாக்கு"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "அளவுரு பட்டியலுக்கு வேறொரு பெயரை தேர்ந்தெடுக்கவும்."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "தன் உருவாக்க வழிகள்"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "பங்குAகுணங்கள் "
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "ஆக்கி முறையை காலிசெய்"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "பங்குbகுணங்கள் "
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "அணுகுச் சங்க முறைகள்"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "பங்குa தெரியும் அளவு"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "ஆட்டிரிபியுட் அணுகு முறைகள்"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "பங்குb தெரியும் அளவு"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "மூலப்பொருளிலிருந்து"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "பங்குA மாற்றக்கூடிய"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "ஆட்ரிபுட் ஸ்கோப்பையின் முன்னிருப்பு"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "பங்குb மாற்றக்கூடிய"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "செயல்பாடு ஸ்கோப்பின் முன்னிருப்பு"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "கொண்ட பொருள்கள்"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "மூலப் பொருளிலிருந்து"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "ஆவணத்தை குறிப்பெடு"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">ஜாவா குறியீடு உருவாக்கம்</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "புதிய குணம்"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "புதிய இயக்கம்"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "மாதிரி உருக்கள்"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">C++ குறியீட்டு வகை</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "புதிய மாதிரி உரு"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "மொழி"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum  நிலையுரு"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "கோப்புரை"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "புதிய Enum   நிலையுரு"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "கோப்புரைக்கு உருவாக்கிய அனைத்து கோப்புகளையும் எழுது:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "குணங்கள்"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&தேடு..."
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "புதிய குணம்"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&தேடு"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "தொடக்கத்தள செயற்பாடு "
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "கோப்புரையிலிருந்து தலைப்பு கோப்புகளை &உள்ளிடு:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "முடிவு செயற்பாடு "
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "கோப்புகள் இயற்றியை அடைவில் குறிப்புரை இயற்றியை எழுதுக"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "செயற்பாட்டு வகை "
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr "இந்த அடைவைப் பயன்படுத்தி தோற்றுவிக் குறிப்புரையின் தலைப்புக் கோப்புகள்  "
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "செயற்பாட்டுப் பெயர்"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "மேலெழுது"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "சாளர நிறம்"
+#: 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 ""
+"இந்த கோப்பின் குறிப்புரைப் பெயரில் பெயர்\n"
+"மின்னக்கி விரும்பிப் பயன்படுத்திய வெளியீடு கோப்பு ஏற்கனவே உள்ளது: "
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "பண்பு குணங்கள்"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "மேலெழுது"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "துவக்கு மதிப்பு"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "செல்லிடம் அடைவிலிருந்து வெளியேறும் தற்பொழுதுள்ள மேலெழுது கோப்புகள் "
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "பொது"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&கேள்"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "தாங்கள் ஒரு செல்லாத பண்பு பெயரை உள்ளிட்டுள்ளீர்கள்"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "இந்த கோப்பின் பெயர் ஏற்கனவே வெளியாகியுள்ளது, என்ன செய்வது என்று கேளுங்கள்"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "பண்புக்கூறுப் பெயர் செல்லத்தக்கதாக இல்லை"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "வேறு பெயரை &பயன்படுத்து"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "பண்புக்கூறுப் பெயர் தனிப்பட்டதாக இல்லை"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "வடிவமைத்தல்"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "செயல் தேர்ந்தெடு"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "கோடுகள்"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "தொடர் எண்"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "வரியின் முடிவுப்பாணி"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "வகுப்பு செயல்பாடு:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "வரிசைபடுத்தும் வகை:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "வழக்க செயல்பாடு:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "வரிசைப்படுத்தும் தொகை:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "& வரைப்படங்கள்"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
+"*NIX (\"\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "வடிகட்டி"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr ""
+"சாளரங்கள் (\"\\r\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&தற்போதைய வரைபடம்"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "மெக் (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&எல்லா வரைபடங்கள்"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "உள்ளமைவு இல்லை"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&வரைபடத்தை தேர்ந்தெடு"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "தத்தல்"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "வரைபட வகைகள்"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "இடைவெளி"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "தேர்வு"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "அதிகமாக குறிப்பெழுது"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "கூட்டுமுயற்சி"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "&பிரிவுக் காலியாக இருக்கையில் கட்டளையைப் பிரிவில் எழுதுக"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "வரிசை"
+#: 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "ஒரே வரிசையில் நிறுத்துதல்"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&எழுதி ஆவணமாக்குதல் கருத்துரைக் காலியாக உள்ளது"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "வரைபடம் எதுவும் தேர்ந்தெடுக்கப்படவில்லை"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "காலியாகயிருக்கையில் வகுப்புக்காகக் கட்டளையும் மற்றும் ஆவணமாக்குதல் முறையை எழுது"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "காட்சி குணங்கள்"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "மொழித் தேர்வுகள்"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "பண்புக்கூறு அமைவுகள்"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "குறிப்பு உருவாக்க வழிகாட்டி"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "செயல்பாடு அமைவுகள்"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "வகுப்புக்களை தேர்ந்தெடு"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "மாதிரி உரு அமைவுகள்"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr "குறியீடை உருவாக்க எல்லா பிரிவையையும் இடதுப் பக்க பட்டியலுக்கு அனுப்பவும்"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "MIME நிலையுரு அமைவுகள்"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "குறியீடு உருவாக்கத்திற்கு வகுப்பை சேர்"
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "பண்புக்கூறு அமைவுகள்"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "தேர்ந்தெடுத்த வகுப்புகள்"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "உள்ளடக்க அமைவுகள்"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "குறியீடு உருவாக்கத்திற்கு வகுப்பை நீக்கு"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "கூட்டு"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "வகுப்புகள் கிடைக்கும்"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "வகுப்பு அடையாளம்"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "குறியீட்டு உருவாக்கத்தின் நிலை"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "செயல்பாடுகள்"
+#: dialogs/codegenerationwizardbase.ui:226
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "உற்பத்திப் பொத்தானை அழுத்திக் குறியீடு உருவாக்கத்தை தொடங்கு"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "தெரிவது"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "உருவாக்கத்தின் நிலை"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "செயல்பாடு கையொப்பம்"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "மறைந்துள்ள தொகுப்புகளைக் காட்டு"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "தொகுப்பு"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">இங்கு பொருள்கூறு பெயரை உள்ளிடவும்</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "குணங்கள்"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "ஸ்டிரியோவகை"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "தொகுதி முறையை காட்டு"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "குணங்கள் கையொப்பம்"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "நிறங்கள்"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "வட்டமாக வரை"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "எழுத்துரு:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "துவக்க நிலை"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "காகிதம்:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "முடிவு நிலை"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "தேர்ந்தெடுத்த"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "நிலையின் வகை"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML பொருள் தொகுதி:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "நிலையின் பெயர்."
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">தொகுதியை மறை:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "சாளர வண்ணம்"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">திருத்தமுடியாத உரை:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "புதிய வகுப்பு"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">திருத்தமுடிந்த உரை</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "புதிய வகுப்பு"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "வரிப்பட குணங்கள்"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "வகுப்பு குணங்கள்"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "பெரிதாக்கு:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "வகுப்பு செயல்பாடுகள்"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "அளவுரு குணங்கள்"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "க்ட்டத்தை காட்டு"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "திசையை செலுத்துதல்"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "கட்டத்துக்கு இழுத்துச் செல்"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "செயற்கூறு அளவை திணி"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
-"\"உள்ளே\" என்பது படிக்கமட்டும் அளபுரு, \"வெளியே\" என்பது எழுத மட்டும் உள்ள "
-"அளபுரு மற்றும்\"உள்ளே வெளியே\" என்பது படித்தல் மற்றும் எழுதுதலுக்கான அளபுரு."
+"பல கட்ட இடத்திற்காக பொருள்கூறின் அளவை சுருக்கு.\n"
+"'கட்டத்துடன் சேர்'  பொருள்கூற்றை செயலாக்கிவிட்டது என்றால் 4 பக்கமும் கட்டங்களாக அமைக்கப்படும்."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "உருவாக்கு"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "கட்ட இடைவெளி:  "
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "முடி"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "கோடு உருவாக்கப்பட்டது."
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "உருவாக்கப்படவில்லை "
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "கோட்டின் அகலம்:"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "இன்னும் உருவாக்கப்படவில்லை "
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "படமாக ஏற்றுமதி செய்..."
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
-"கோப்பு %1 ஏற்கனவே உள்ளது.\n"
-" அதனை மேல் எழுத வேண்டுமா?"
-
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "வெளியீடு அடைவு இல்லை"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "அடைவினை உருவாக்க முடியவில்லை"
-
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "கோப்பினை உருவாக்கக்கூடாது."
-
-#: dialogs/codegenerationwizard.cpp:168
-#, fuzzy
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
-"இந்த அடைவுத் தோன்றவில்லை.\n"
-"தயவுச் செய்து பெற்றோர் அடைவு அல்லது செல்லுபடியாகும் அடைவினை எழுதுவும்."
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "பிழை உருவாக்கும் அடைவு"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "நிலையின் வகை"
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "தயவுச் செய்து முறையான அடைவினை தேர்ந்தெடுக்கவும்"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "அடைவு"
 
-#: dialogs/codegenerationwizard.cpp:184
-#, fuzzy
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"வெளியீட்டு அடைவு இருக்குகிறது, ஆனால் இதனை எழுத முடியாது.\n"
-"தயவுச் செய்து சரியான அனுமதிகள் அல்லது பிற அடைவினைத் தேர்ந்தெடுக்கவும்."
-
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "வெளியீடு அடைவில் பிழையை எழுது"
-
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 அடைவாக இல்லை. செல்லுபடியாகும் அடைவை தேர்ந்தெடுக்கவும்."
-
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "தயவுச் செய்துச் செல்லுப்படியாகும் அடைவினை தேர்ந்தெடுக்கவும்"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "சேரும் கோப்பு ஏற்கனவே இருக்கிறது."
-
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
+"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 ""
-"%1 கோப்பு ஏற்கனவே %2 இல் இருக்கிறது. அம்பிரல்லொ அந்த கோப்பினை மேலெழுதலாம். இதே "
-"கோப்பினையோ அல்லது வேறொரு இதனைப் போன்ற கோப்பினை உருவாக்கவும்."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "மீதமுள்ள எல்லா கோப்புகளுக்கும் விண்ணப்பிக்கவும்"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "மேல் எழுது"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "இதைப்போன்ற வேறொரு கோப்பு பெயரினை உருவாக்கவும்."
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "கோப்பினை உருவாக்கக்கூடாது."
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p அமைப்பு =\"மையம்\">விருப்பங்கள் இல்லை.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "பலவகைப்பட்ட"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "பலமடமாக்கத்தை உள்ளிடு:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "தொடர்புருவின் பெயர்"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "தொடர்புரு பெயரை உள்ளிடு: "
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "பங்கின் பெயர்"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "பெயரை உள்ளிடு: "
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "செயல்பாடு பெயரை உள்ளிடு: "
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "புதிய உரையை பதிவு செய்யவும் "
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "பிழை"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "பங்கு மாற்றும்"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "உரையை மாற்று "
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "தெரியும் பங்கு"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "இடதுபுறத்தை வரிசைப்படுத்து"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "வலப்புறத்தை வரிசைப்படுத்து"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "மேலே வரிசைப்படுத்து"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&வரைப்படம் "
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "கீழே வரிசைப்படுத்து"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&புதிய"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "மேல்கீழ் மையத்தை வரிசைப்படுத்து"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&காட்டு"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "இடவல மையத்தை வரிசைப்படுத்து"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "பெரிதாக்கு:"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "மேல்கீழ் மையத்தை வரிசைப்படுத்து"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&குறிமுறை"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "இடவல மையத்தை வரிசைப்படுத்து"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "இயங்கு மொழி"
 
-#: aligntoolbar.cpp:383
+#: tips:3
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
-"வரிசைப்படுத்த இரண்டு பொருள்களை நீங்கள் தேர்ந்தெடுக்கவேண்டும். அதாவது வகுப்புகள் "
-"அல்லது நடிகர்கள். சங்கங்களை வரிசைப்படுத்த முடியாது"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
-"இது வடிவமைக்கப்பட்ட குறியீடு உருவாக்கியின் மொழிக்கான ஒதுக்கப்பட்ட விசைப்பலகை."
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "விசைப்பலகை ஒதுக்கப்பட்டது"
+#: 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 ""
 
-#: umlviewimageexporter.cpp:46
+#: tips:23
 #, fuzzy
-msgid "Exporting view..."
-msgstr "வெளியேறுகிறது"
-
-#: umlviewimageexporter.cpp:50
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Most diagram items can not be resized, they will resize themselves to fit "
+"to their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and "
+"drag on the red square.</p>\n"
 msgstr ""
+"<p>பல வரைப்படம் வகையின் அளவை மாற்ற இயலாது, பிறகு அவை தானாக தொகுப்பில் சேமித்து "
+"வைத்து கொள்ளும்.\n"
+"பெட்டிகள், குறிப்பு மற்றும் செய்தி வரைப்படத்தின் தகவல் அளவை மாற்ற இயலும். சிகப்பு "
+"சதுரத்தில் சொடுக்கி மற்றும் அழுத்தவும்.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:30
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 msgstr ""
-"கோப்பு %1 ஏற்கனவே உள்ளது.\n"
-"அதனை மேல் எழுத வேண்டுமா?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "கோப்பு முன்பே உள்ளது"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "புது_நடிகன்"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "புது_கெஸ் உபயோகி"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "புது_பணித்தொகுப்பு "
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "புது_பகுதிகள்"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "புது_முனை"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "புது_ ஆர்திபாக்ட்"
+"<p>வரைபடத்திற்கு ஏற்கனவே இருக்கும் வகுப்பை நீங்கள் சேர்க்க விரும்புகிறீர் என்றால் மர "
+"பார்வையில் இருந்து உள்ளிட்டை எடுக்கவும்.</p>\n"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "புது_இடைமுகம் "
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "புது_தரவு இனம் "
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "புது_ஈனம்"
-
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "புது_ஈனம்"
-
-#: model_utils.cpp:264
+#: tips:36
 #, fuzzy
-msgid "new_folder"
-msgstr "புது_முனை"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "புது_பொருள்"
-
-#: model_utils.cpp:559
-msgid "Empty"
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
 msgstr ""
+"<p>Umbrello's புதிய தரகர் மீண்டும் உருவாக்கில் அடித்தல் மற்றும் வகுக்கப்பட்ட வகுப்புகளில் "
+"செயல்களை \n"
+"இடமாற்றலாம்.\n"
+"தரகர் மீண்டும் உருவாக்கில் திறக்க வகுப்புகளை வலது சொடுக்கவும்.</p>\n"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: 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 ""
+"<p>வரிசை பட பொருள் அழிப்பெட்டியை வைத்து கொள்ளலாம் மற்றும் நடிகனாக வரையலாம். பண்பு "
+"உரையாடலுக்காக\n"
+"இருமுறை சொடுக்கவும்.</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: 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 ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: 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 ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: 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 ""
+"<p>வெட்டி மற்றும் ஒட்டியும் தோற்றத்திலிருந்து PNG இடைநிலைபலகையின் KWord\n"
+"மற்றும் பிற பயன்பாட்டில் ஒட்டவும்.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "தளத்தின் வகுப்பை கூட்டு "
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "பெறுதல் வகுப்புகளை சேர்"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "செயற்பாட்டை கூட்டவும்"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "பண்புக்கூறு  கூட்டவும்"
+#: tips:78
+#, fuzzy
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+"<p>சங்கங்கள் நேர்கோட்டினையும், இரண்டுச் செடுக்கையும் பயன்படுத்தி நகற்றும்\n"
+"புள்ளியை உருவாக்க விரும்பவில்லை.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "தள இடைமூலத்தை சேர்"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>நீங்கள் உள்ளமை ஆம்பர்லா உரையாடலைத் தானாகச் சேமிக்கவும்.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "பெறுதல் இடைமுகப்பை சேர்"
+#: 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 ""
+"<p>Umbrelloக்கு தேவையான ஒரு வசதி குறைகிறதா? எங்களுக்கு தெரிவியுங்கள். \n"
+"ஒன்று உதவி பட்டியின் அறிக்கை பிழையுடன் பிழை தரவுடன் சேர்க்கவும் \n"
+"அல்லது uml-devel கடித பட்டிக்கு அனுப்பவும்.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "தளத்தை வகைப்படுத்தல்"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>நீங்கள் எல்லாப் பொருளையும் அழிக்க விரும்பினால் அழி அல்லது பின் இடம் பொத்தனை அழுத்தவும்.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "பெற்ற வகைப்படுத்தி   "
+#: 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 ""
+"<p>Umbrelloவில் பிழை கண்டுபிடித்தால், எங்களுக்கு தெரிவியுங்கள். \n"
+"உதவி பட்டியின் அறிக்கை பிழை கருவியுடன் பிழை தரவுடன் நீங்கள் சேர்த்து அனுப்பவும்.</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "அடைவினை உருவாக்க முடியவில்லை"
+#: 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 ""
+"<p>பொத்தனை அழுத்தித் தப்புதல் விசையை அமைத்து தற்போதைய கருவியிலிருந்து கருவியைத் "
+"தேர்ந்தெடுக்கவும்\n"
+"பின்னிருந்து முன்னுக்கு செல்லக் கருவிப் பயன்படுத்துக.</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "காலியான வரைபடத்தை சேமிக்க இயலாது"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>எல்லாப் பொருளையும் தேர்ந்தெடுக்க Ctrl-A என்று அழுத்துவும்.</p>\n"
 
-#: 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 ""
+"<p>புதிய வகுப்பு வழிகாட்டியின் குறிப்பொறைப் பட்டியலைப் பயன்படுத்தி நீங்கள் புதிய வகுப்பு "
+"உருவாக்கு மற்றும் மேலமைக்கவும்.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "புது_ஸ்டிரியொ வகை"
@@ -4152,7 +4237,8 @@ msgstr ""
 #~ msgid "Creates association relationships between UML elements"
 #~ msgstr "உருவாக்கும் சங்கத்தின் உறவுமுறை இடையே UML மூலகம்"
 
-#~ msgid "Creates unidirectional association relationships between UML elements"
+#~ msgid ""
+#~ "Creates unidirectional association relationships between UML elements"
 #~ msgstr "உருவாக்கும் திசையில்லா சங்கத்தின் உறவுமுறை இடையே UML மூலகம்"
 
 #, fuzzy
@@ -4190,11 +4276,13 @@ msgstr ""
 #~ msgstr "வகுப்பு"
 
 #~ msgid ""
-#~ "<p>Many new code generators have been added in this release.  You can now generate code for\n"
+#~ "<p>Many new code generators have been added in this release.  You can now "
+#~ "generate code for\n"
 #~ "JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, IDL and Ada.</p>\n"
 #~ msgstr ""
 #~ "<p>பல புதிய குறிமுறை உருவாக்காளர் இதில் உள்ளது.  இனிமேல் நீங்கள்\n"
-#~ "ஜாவா சிகிரப்ட், செயல் சிகிரிப்ட், XMLசிகிமா, பெர்ல், பைத்தான், SQL, IDL மற்றும் Adaவுக்கு நீங்கள் குறிமுறை உருவாக்கலாம்.</p>\n"
+#~ "ஜாவா சிகிரப்ட், செயல் சிகிரிப்ட், XMLசிகிமா, பெர்ல், பைத்தான், SQL, IDL மற்றும் "
+#~ "Adaவுக்கு நீங்கள் குறிமுறை உருவாக்கலாம்.</p>\n"
 
 #~ msgid "UML Diagrams"
 #~ msgstr "UML வரைபடம்"
diff --git a/tde-i18n-tg/messages/tdesdk/umbrello.po b/tde-i18n-tg/messages/tdesdk/umbrello.po
index efc6f8fb6e0..55e4c99dcfe 100644
--- a/tde-i18n-tg/messages/tdesdk/umbrello.po
+++ b/tde-i18n-tg/messages/tdesdk/umbrello.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2005-09-17 13:21+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -22,256 +22,214 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Муаллифи Umbrello"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Файлро кушоед"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
+"* НПО \"Имкониятҳои ҷавонон\" * Tajik Linux Users Group * Young Ladies Tajik "
+"Linux Users Group * http://www.khujand.org * http://www.tajikngo.org * "
+"http://www.yo-tj.org * Роҷер Ковакс, Виктор Ибрагимов, Марина Колючева, "
+"Евгения Фатхеева, Акмал Ватаншоев, Абророва Хиромон, Акмал Саломов, Акбар "
+"Ватаншоев, Фарход Ахмедов, Эркин Пулатов, Гулшод Довуди, Гулноз Курбанова, "
+"Зарина Косымова, Шухрат Лоиқов, Сурайё Ҷурахонова *"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:2
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
-"(c) 2001 Paul Hensgen, (c) 2002-2004 Гурӯҳи истихроҷкунандаҳои Umbrello "
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Муаллифи Umbrello"
-
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Захира кардан мисли тасвир..."
+"rkovacs@khujand.org, youth_opportunities@tajikngo.org, MarinaKL@tajikngo.org"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "Ҳангоми нигоҳдории файл хатогӣ рӯй дода шуд: %1"
+#: 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/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 "Нигоҳдории нодуруст"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Ба канори чап рост намоед"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Мавзӯъ"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Ба канори рост рост намоед"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Паёми ҳамгомӣ"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Ба канори боло рост намоед"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Паёми ноҳамгомӣ"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Ба канори поёни рост намоед"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Иттиҳод"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Рост намудан ба таври амудӣ (дар байни киёниҳо)"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Гунҷоиш"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "Рост намудан ба таври уфуқӣ (дар байни киёниҳо)"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Истинод кардан"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Рост намудан ба таври амудӣ (дар байни киёниҳо)"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Барчасб"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Рост намудан ба таври уфуқӣ (дар байни киёниҳо)"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Эъзоҳ"
+#: 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:253
-msgid "Box"
-msgstr "Қуттӣ"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Зинату ороиш"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Иштироккунанда"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Вобастагӣ"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Ҷамъбаст"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Агрегировандан"
 
-#: worktoolbar.cpp:257
-#, fuzzy
-msgid "Relationship"
-msgstr "Иҷрокунӣ"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Иттиҳоди рости"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Ба амал меоварад (Алоқа/Баамалбарори)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Таркиббандӣ"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "Синф"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Ҳолати аввала"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Ҳолати охир"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Шоха/Боҳампайвастан"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Фокро/Пайвастан"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Бастаи нармафзорӣ"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Қисмат"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Гиреҳ"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Вобастагӣ"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Артифакт"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Иттиҳод"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Итерфейс"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Худиттиҳод"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Намуди маълумот"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Хабар додани кооператсия"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Шакли гузашташуда"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Ахборот ба таври синхронӣ"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-#, fuzzy
-msgid "Entity"
-msgstr "Фаъолияти охир"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Худахбороти кооперативӣ"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr ""
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Худахбороти пайдарпаӣ"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Гунҷоиш"
 
-#: worktoolbar.cpp:277
-#, fuzzy
-msgid "Join"
-msgstr "Фокро/Пайвастан"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Таркиббандӣ"
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "Форк/боҳампайвастан"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Иҷрокунӣ"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Уни-иртибот"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Истинод кардан"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Гузариши вазъият"
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Фаъолияти мегузаштаги"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Фаъолият"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Вазъият"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Бисёрӣ"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Фаъолияти охир"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Бисёриро гузоред:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Фаъолияти аввала"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Номи иттиҳод"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Паём"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Номи иттиҳодро гузоред:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr ""
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Номи нақш"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Интихоб кардан"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Номи нақшро гузоред:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Номи нодуруст."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Номи нодуруст"
+
+#: 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 "Ном аллакай истифода шуда истодааст."
+
+#: 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 "Ном аллакай истифода шуда истодааст"
 
 #: 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."
+"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 ""
 "Яке аз камаҳамиятарин қалам дар забонак гузошта нахоҳад шуд, чунки ба ҳамин "
-"монанд қалам аллакай мавҷуд дорад.  Вале дигар қаламҳо аллакай гузошта шудаанд."
+"монанд қалам аллакай мавҷуд дорад.  Вале дигар қаламҳо аллакай гузошта "
+"шудаанд."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 msgid "Paste Error"
@@ -290,10 +248,8 @@ msgid "Cannot Open File"
 msgstr "Файлро натавонистам кушод"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Натавонистам каталогро бунёд созам:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Натавонистам каталогро бунёд созам:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -307,1339 +263,1550 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Натавонистам каталог бунёд созам"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Номи ҳолатро гузоред"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Параметрҳои ҳамагӣ"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Номи ҳолати навро гузоред:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Покат барои фазои ном мебошад"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Фаъолиятро ворид кунед"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Деструктураҳои виртуали"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Номи фаъолияти навро гузоред:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Ҳосил кардани конструкторҳои холи"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "фаъолияти нав"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Ҳосил кардани роҳи метод ба хусусиятҳо"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-#, fuzzy
-msgid "UML Model"
-msgstr "Umbrello"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Операсияи дар дарун сохташуда"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Пешниҳодҳои мантиқӣ"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Роҳи методҳо ба хусусиятҳои дар дарун сохташуда"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Андеша аз тарафи собиқаҳо"
+#: codegenerators/cppcodegenerationform.cpp:57
+#, fuzzy
+msgid "Accessors are public"
+msgstr "Роҳи методҳо ба хусусиятҳои дар дарун сохташуда"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Андеша аз тарафи собиқаҳо"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Порид намудани файл: %1"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Андеша аз тарафи кушоиш"
+#: 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 "Таёр."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Намуди маълумотҳо"
-
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
 msgstr ""
-"Фйали ҷорӣ тағир дода шуда буд.\n"
-"Нигоҳ дорам?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Файли %1 мавҷуд надорад."
+#: codeimport/import_utils.cpp:183
+#, fuzzy
+msgid "Namespace"
+msgstr "фосилаи номҳо чашмдошт карда шуд"
 
-#: 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 "Пурборкунии нодуруст"
+#: 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 "Синф"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Файли %1 зарар расонда шуд."
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Хатогии дохила"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Файли %1 фишурдашуда дар худ XMI надорад."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Хатогии синтаксии пеш аз '%1'"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Ҳангоми пурборкунии файли яла хатогӣ рӯй дода шуд: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Хатогии муҳокимаи грамматикӣ пеш аз '%1'"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Ҳангоми пурборкунии файл хатогӣ рӯй дода шуд: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Ҳангоми фишор дода даровардани файл ба таҳиягари: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "ифода чашмдошт карда мешавад"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "Диаграммаҳои собиқаҳо"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Хатогӣ дар эълони синтаксис"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Синфи диаграмма"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} чашмдошт карда шуд"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "Диаграммаи пайдарпаӣ"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "фосилаи номҳо чашмдошт карда шуд"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "ширкати диаграмма"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "фосилаи номҳо чашмдошт карда шуд"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "диаграммаи молу мулк"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Номи фосилаи номҳо чашмдошт карда мешавад"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "диаграммаи фаъолият"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Шакли мушаххаскунанда барои эълон лозим"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "диагараммаи компонентҳо"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "эълон чашмдошт карда мешавад"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "диаграммаи кушоиш"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Ифодаи собит чашмдошт карда мешавад"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+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 "Ном"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "Номро ворид созед:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Аъзоҳои инисиализаторҳо чашмдошт карда шудаанд"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Диаграммаи номи нодастрас."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Мушаххаскунандаи базаи синфӣ чашмдошт карда шудааст"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Номи нодуруст"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Таркиби инисиализатсиякунонӣ чашмдошт карда мешавад"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Диаграма аллакай ин номро истифода мебарад."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+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"
-msgstr "Ном аллакай истифода шуда истодааст"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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."
-msgstr "Номи нодуруст."
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "Ном аллакай истифода шуда истодааст."
+#: 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:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Чунин ном аллакай вуҷуд дорад.\n"
-"Шумо дар ҳақиқат ҳаминро мехоҳед?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "ифода чашмдошт карда мешавад"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Ном якхела нест"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "чашмдошти инисиализатсиа барои"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Use Name"
-msgstr "Собиқа"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "чашмдошти catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: 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 "Enter New Name"
-msgstr "Номи ҳолатро гузоред"
-
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Шумо мехоҳед ,ки ин диаграммаро нест кунед %1?"
+msgid "Properties"
+msgstr "&Хусусиятҳо"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Нест кардани диаграмма"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Фаъолияти аввалин"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Барқароркунии документ..."
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Охири фаъолият"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Шоха/Боҳампайвастан"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Пурборкунии элементҳои UML..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Фокро/Пайвастан"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Пурборкунии диаграммаҳо..."
+#: 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 "Умумӣ"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Диаграмма"
+#: 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 "Хусусиятҳои умумӣ"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/автохотиргузори%1"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Шакли фаъолият:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ному насаби фаъолият:"
 
-#: umllistview.cpp:416
-#, fuzzy
-msgid "Enter Model Name"
-msgstr "Номи ҳолатро гузоред"
+#: 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 "Ҳуҷҷатнома"
 
-#: umllistview.cpp:417
+#: 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 "Enter the new name of the model:"
-msgstr "Номи нави фаъолиятро гузоред:"
+msgid "Font"
+msgstr "Ҳарф:"
 
-#: umllistview.cpp:1007
-msgid "Views"
-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 "Мизрубҳои навиштаҷот"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Номи ворид карда шуда имконпазир аст.\n"
-"Бунёкунӣ бекор карда шуд."
+#: 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 "Ранг"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ном нодуруст аст"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Рангҳои васеъкунӣ"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Номи ворид карда шуда аллакай истифода шуда истодааст\n"
-"Бунёдкунӣ бекор карда шуд."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Фаъолиятҳо"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Фаъолияти нав..."
 
-#: umllistview.cpp:2338
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid "Loading listview..."
-msgstr "Пурбори диаграммаҳо..."
+msgid "Delete"
+msgstr "Нобуд кардани бадарға"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Каталогро пеш аз нобуд сохтан озод намоед."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Номро аз сари нав гузоштан"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Каталог холӣ нест"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Фаъолияти нав"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "Амалиёт бо ҳамин ном ва рақами ҷузъбандӣ аллакай мавҷуд дорад."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "фаъолияти нав"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Номи фаъолиятро гузоред"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Фаъолиятро номгузории дубора кунед"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "ҳолати нав"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Номи нави фаъолиятро гузоред:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Ҷамъбаст"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Ном:"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Худиттиҳод"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Намуд:"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Хабар додани кооператсия"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Ширкатҳо"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Ахборот ба таври синхронӣ"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Хусусияти ҷамъиятӣ"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-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 "Дурусткуниҳои умумӣ"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Худахбороти пайдарпаӣ"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Нақшҳо"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Иҷрокунӣ"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Намои нақшҳо"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Уни-иртибот"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Ҳуруфи ҷамъиятӣ"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Хусусияти нақши А"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Диаграмма"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Хусусияти нақши В"
+
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Дидашавандаи нақши А"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Дидашавандаи нақши В"
+
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Имкони тағир додани нақши А"
+
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Имкони тағир додани нақши В"
+
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&New"
-msgstr "&Нав"
+msgid "Rolename:"
+msgstr "Номи нақш:"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Sh&ow"
-msgstr "На&моиш"
+msgid "Multiplicity:"
+msgstr "Бисёрӣ:"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Рамз"
+msgid "Public"
+msgstr "Умумӣ"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: 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 "Active &Language"
-msgstr "Забони &фаъолият"
+msgid "Private"
+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
+#: 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 "Documentation"
+msgid "Protected"
+msgstr "Муҳофиз карда шуда"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
 msgstr "Ҳуҷҷатнома"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Слеш-Слеш (//)"
+msgid "Changeable"
+msgstr "Имконоти тағирпазирӣ"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Слеш-ситорача (/**  */)"
+msgid "Frozen"
+msgstr "Не"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Style:"
-msgstr "Услуб:"
+msgid "Add only"
+msgstr "Фақат барои илова намудан"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Пайдоиши коди C++</p>"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+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 "Умумӣ"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Номи &иштироккунанда:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr "Пайдоиши тани метод"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Номи &пакет:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Дар вақти пайдоиши код синфҳои зеринро истифода баред:"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "Истифодаи номи &назир:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Номи &интерфейс:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "вектор"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Номи &қисмат:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Тағйирёбанда</b>"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Номи &артифакт:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Номи &шакли гузашташуда:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "Сатр (QString)"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Номи &намуди маълумот:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "сатр"
+#: dialogs/classgenpage.cpp:68
+#, fuzzy
+msgid "Entity &name:"
+msgstr "Номи &шакли гузашташуда:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Сатр</p>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Номи қолаби чоп:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Рӯйхат</p>"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Номи пакет:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "Си&нфи мавҳум"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>глобалӣ?</i>"
+#: dialogs/classgenpage.cpp:123
+#, fuzzy
+msgid "A&bstract use case"
+msgstr "Си&нфи мавҳум"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Файли фармондиҳӣ"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Номи синф"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Нақшакашӣ мисли"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Васл кардани файл</p></i>"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Пешфарз"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Пайдоиши лоиҳа"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Ранг кардан:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "Бунёд кардани файли васлкунии ANT"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Китобхона"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Ҳосил кардани методҳо ба таври автоматӣ"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Ҷадвал"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Созандаҳои холӣ"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Намоёнӣ"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Методҳои дастрасӣ ба иттиҳод"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "Ош&кор"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Методҳои дастрасӣ ба махсусиятҳо"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+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 "Умумӣ"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+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 "Ғайрирасми"
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+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 "Муҳофиз карда шуда"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Номи синф:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Аз объекти волидайн"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Номи нусхагӣ:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Маҳали дидашавандагии методҳои дастрасӣ ба махсусиятҳо нобаён мебошад:"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Рассомӣ кардан ҳамчун рӯи коркунанда "
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "Маҳали дидашавандагии хатҳои иттиҳодро нобаён мебошад:"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Якчанд нусха намудан"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Аз нақши волидайн"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Намоиш додани харобкунанда"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Ҳосил кардани код дар Java</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Қисмати ном:"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr ""
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Номи гиреҳ:"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
 msgstr ""
+"Ин ном аллакай истифода шуда буд\n"
+"Вай партофтагӣ мебошад."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Пайдоиши коди C++</p>"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Ном аллакай мавҷуд дорад"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Атрибутҳо"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Атрибут бунёд кардан..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Амалиётҳо"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "А&малиёти нав..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Қолибҳо"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "&Қолиби нав..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Константаҳои гузаронидашуда"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "&Константаи гузаронидашударо илова кардан..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "Атрибутҳо"
+
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "&Атрибут бунёд кардан..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Нобуд кардани бадарға"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Хусусиятҳо"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Тасвир намудан"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Амалиётҳо"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Дидашаванда"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Рақами ҷузъбан&дии амалиёт"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Пакет"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&Артрибутҳо"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Қолаби чоп"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Рақами ҷузъ&бандии артрибут"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Расм кашидан ҳамчун марказнок"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Тасвир кардан"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Намоиши интихобҳо"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Танзимотҳои аттрибут"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Танзимотҳои амалиёт"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Танзимотҳо қолибҳо"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Шакли константаҳои гузаронидашуда"
+
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "Танзимотҳои аттрибут"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Гунҷоиш"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Танзимотҳои мундариҷа"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Ширкатҳои синфӣ"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "синфи_нав"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Синфи нав"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Аттрибутҳои синфӣ"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Амалиётҳои синфӣ"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Параметрҳои генерацияҳои код"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Забон"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Генерирондан"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Каталогҳо"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Ба охир расид"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Нигоҳ доштани файлҳои ҳосил кардашуда дар каталог:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Код генерирондашуда"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Доир&аи назар..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ногенерирондашуда"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Доир&аи назар..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ҳоло гененерирондашудаги нест"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Васл кардани файлҳои сарлавҳагӣ аз каталог:"
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Луғати %1 дар мавҷуд нест. Мехоҳед ки ӯро эҷод кунед?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Файлҳои ҳосилшуда дар ҳамин каталог нигоҳ дошта мешаванд"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Луғати охирин дар мавҷуд нест"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Натавонистам каталог бунёд созам"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "&Файлро пешниҳод накунед"
+
+#: dialogs/codegenerationwizard.cpp:168
+#, fuzzy
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Файлҳои ҳамин каталог дар вақти пайдоиши код мисли файлҳои сарлавҳагӣ истифода "
-"бурда мешаванд"
+"Луғатро эҷод карда натавонист.\n"
+"Бовари ҳосил кунед ки, шумо тамоми навишти ҳуқуқиро дар луғатаи модариаш "
+"дошта бошед."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Файлҳои вуҷуд буда"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Хатоги дар эҷод кардани луғат"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "Лутфан номи луғатро интихоб кунед."
+
+#: dialogs/codegenerationwizard.cpp:184
+#, fuzzy
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Агар файл бо номи, ки бо генератори код \n"
-" истифода бурда мешавад, аллакай вуҷуд дошта бошад:"
+"Каталоги хуруҷӣ мавҷуд аст,аммо дар навмуди навишта нест.\n"
+"Лутфан махсусияшро гузоред ё ин ки каталоги дигарро интихоб кунед."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "И&ваз кардан"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+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"
-msgstr "Иваз кардани файлҳои вуҷуд буда"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 рӯйхат хисобида намешавад."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Пур&сидан"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "рӯйхати имконпазирро интихоб кунед"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr ""
-"Агар файл бо ҳамин гуна ном аллакай вуҷуд дошта бошад, он гоҳ дар бораи амалҳои "
-"минбаъд пурсед"
+msgid "Code Viewer"
+msgstr "Аз назар гузарондани код"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Номи дигарро интихоб кунед"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Параметрҳои имконпазир мавҷуд надорад.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Диаграммаҳо "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Зинату ороиш"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Филтр"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Сатрҳо"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Диаграммаи ҷоришаванда"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Охири сатр:"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Ҳамаи диаграммаҳо"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Навъи фосилаҳо:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Ҷудо намудани диаграммаҳо"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Миқдори аломатҳо:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Намуди диаграммаҳо"
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Ҷудокунӣ"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Собиқа"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Кооператсия"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Пайдарпаӣ"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Вазъият"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Қисмат"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "Андеша аз тарафи кушоиш"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Диаграмма"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Диаграммаҳои интихоб карда шуда мавҷуд надорад."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+msgid "The format that the images will be exported to"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Аз назар гузаронидани ҳуҷҷатҳо"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Охирини парванда аллакай мавҷуд аст"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"Парвандаи %1 аллакай дар %2 мавҷуд аст.\n"
+"\n"
+"Шумо метавонед ки парвандаро алиш кунед,парвандаро нигоҳ доред бо номи дигар,"
+"ё ин ки ин парвандаро тамоман нагенериронед."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Ба ҳамаи файлҳои гузашта гузаред"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Бефосила"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Иваз кардан"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Табулятсия"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Ҳамин гуна номи файлро пешниҳод кунед"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Фосила"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Файлро пешниҳод накунед"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Эзоҳоти Муфассалӣ"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+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/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Намуд:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Ном:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Маънои аввалин:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
-"Навиштани эзоҳот &барои шӯъбаҳо ҳатто агар \n"
-"онҳо холӣ бошанд"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"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 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Навистани шарҳи ҳуҷҷатҳо ҳатто онҳо холӣ ҳам бошанд"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr "Навистани шарҳ барои &синфҳо ва методҳо ҳатто онҳо холӣ ҳам бошанд"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Амалро интихоб намоед"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Параметрҳои забон"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Рақами пайравикунанда:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Устои пайдоиши рамз"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Амалиёти синфӣ:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Интихоби синфҳо"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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"
-msgstr ""
-"Ҳамаи синфҳоро бо хоҳиши худ барои пайдоиши код гузоред\n"
-"барои дар дасти рости тарафи саҳифа"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Мизроб сохтани Umbrello"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Илова кардани синф барои пайдоиши рамз"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Интерфейс"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Синфҳои интихобшуда"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Интерфейси истифодабаранда"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Кӯр кардани синф аз ҳосилкунии код"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Ранги сатр:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Синфҳои дастрас"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Ранги элом нагашта шуда"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Ҳолати пайдоиши рамз"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Рангро рехта пур кардан:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Пахш кардани тугмаи пайдоиш барои оғоз намудани пайдоиши код"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Ран&ги элом нагашта шуда"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Ҳолати пайдоиш"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Васеъгии сатр:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Аз назар гузарондани код"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "&Васеъгии элом нагашта шуда"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Тасвир кардани блокҳои пинҳон"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Истифода намудани пуркунанда"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">дар ин ҷо номи қисмат</p>"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Тасвир кардани навъи блок"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Пахш намудани амалиёти сабт барои бекор кардан"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Рангҳо"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "диаграммаи молу мулк"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Ҳарф:"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Қоғаз:"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Маҳали дидашавандагии хатҳои иттиҳодро нобаён мебошад:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Ҷудокунӣ:"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Автонигоҳдорӣ"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Блоки объекти UML:</p>"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Пахш намудани автонигоҳдорӣ"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Блоки пинҳонӣ:</p>"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Фосилаи автонигоҳдорӣ, дар як дақиқа:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Матни тағйирнашаванда:</p>"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Васеъкунии автонигоҳдорӣ:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Матни ивазшаванда:</p>"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Хусусиятҳои диаграмма"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Сар додан"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ном:"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Логотип"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Калон кунӣ:"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Маслиҳати рӯз"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Пурборкунии лоиҳаи охирин"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
-msgstr "Намоиш додани амалҳои рақами ҷузъбандӣ"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Оғоз намудани лоиҳаи нав бо:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Намоиши &шабака"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Бе диаграмма"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Ба шабака &бастан"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Синфи диаграмма"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Бастани андозаи қисматҳо"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+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."
-msgstr ""
-"Тасвири лаҳзаи андозаи қисматҳо метавонад чандин тӯри фосилагузорӣ дошта "
-"бошад.\n"
-"Агар тасвири лаҳза ба тӯри  фосилагузаранда тавоно сохтани қисматҳо ҳамавақт ба "
-"тӯри ҳамаи он 4 тарафҳо саф оварда мешаванд."
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Диаграммаҳои пайдарпаӣ"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Интервали шабака:  "
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Корпоратсияи даиграмма"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Вазъияти диаграмма"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Фаъолияти диаграмма"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Бари сатр:  "
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Қисмати диаграмма"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Захира кардан мисли тасвир..."
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Кушоиши диаграмма"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+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"
-msgstr ""
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Намоиш додани дидаша&ванда"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Навъи ҳолат:"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+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"
-msgstr ""
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Намоиш додани амалиётҳо"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "каталог"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Намоиши &қолаби чоп кардан"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Намоиши додани рақами ҷузъбандии артрибут"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
-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)."
-msgstr ""
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Намоиши пакет"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
-msgid "Role Properties"
-msgstr "Хусусиятҳои нақш"
+msgid "Show operation signature"
+msgstr "Намоиш додани амалҳои рақами ҷузъбандӣ"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Номи нақш:"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Минтақаи аввали дидашаванда"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Бисёрӣ:"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Минтақаи дидашавандаи атрибутҳои элом нагашта шуда:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Имконпазирии ивазкунии нақш"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Минтақаи дидашавандаи амалҳои элом нагашта шуда:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Фақат барои илова намудан"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Генератсияи код"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Не"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Генератсияи код"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Имконоти тағирпазирӣ"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Аз назар гузарондани код"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Дидашавандагии нақш"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+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 "Ҳуҷҷатнома"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+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"
-msgstr ""
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Навъи ҳолат:"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Номи ҳолат:"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Ранги васеъкунӣ"
 
-#: tips.txt:19
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Хусусиятҳои аттрибут"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "&Минтақаӣ биноии классификатор (\"static\")"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Ошкор"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Мудофиакардашуда"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
 #, fuzzy
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Бисёри қалами диаграммаҳо наметавон дубора андоза гузошт, онҳо худсарона аз "
-"нав андоза бо дигар қисматҳо мувоффиқ оянд.\n"
-"Қуттиҳо, сабтҳо ва тартиби мактубҳои диаграмма ҳангоми пахш намудан аз нав "
-"андоза гузошта мешавад ва бо майдони сурх кашида мешавад.</p>\n"
+msgid "I&mplementation"
+msgstr "&Ҳуҷҷатнома"
 
-#: tips.txt:25
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Шумо номи хусусияти нодурутро гузоштед."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Номи аттрибут нодуруст"
+
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
+"The attribute name you have chosen is already being used in this operation."
 msgstr ""
-"<p>Агар шумо мехоҳед, ки синфи вуҷудшударо дар диаграмма дохил кунед, фақат ӯро "
-"аз синфи дарахт ба чап гузаронед.</p>\n"
+"Номи хусусияте ки шумо интихоб кардед дар амалиёт аллакай истифодашудааст."
+
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Номи аттрибут ягона нест"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:43
 #, fuzzy
-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"
+msgid "Entity Attribute Properties"
+msgstr "Хусусиятҳои аттрибут"
+
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "&Пешфарз"
+
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
-"<p>Umbrello нави омилбандии иҷрогар иҷозат медиҳад, ки шумо амалро байни синф "
-"ҳаракат дод ва онро боз қабул намояд ва асоси\n"
-" синфҳоро ҳам.\n"
-"Пахши дурусти синф омилбандии иҷрогарро метавон кушод.</p>\n"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 msgstr ""
-"<p>Объектҳои диаграммаҳои баромадшуда метавонанд блоки деструктура ва дар "
-"намуди иштирокшавандаҳо кашида шуда, дошта бошанд. Пахши дубора ба кушодани "
-"маълумотҳо меоварад.</p>\n"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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/umlentityattributedialog.cpp:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "Атрибутҳо"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 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"
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "&Нав"
+
+#: dialogs/umlentityattributedialog.cpp:115
+#, fuzzy
+msgid "&Primary"
+msgstr "&Китобхона"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 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"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
 msgstr ""
-"<p>Буридан ва нусха намудан тасвирро ба забонаки PNG содир менамояд, вале "
-"кадоме ки дар KWord гузошта шудааст\n"
-"ва дар дигар барномаҳо.</p>\n"
 
-#: tips.txt:66
+#: dialogs/umlentityattributedialog.cpp:184
 #, fuzzy
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Пайвастагиҳо набояд дар хатҳои рост бошанд,\n"
-"нуқта.</p>\n"
+msgid "You have entered an invalid entity attribute name."
+msgstr "Шумо номи хусусияти нодурутро гузоштед."
 
-#: tips.txt:71
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "Номи аттрибут нодуруст"
+
+#: dialogs/umlentityattributedialog.cpp:192
+#, fuzzy
 msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"<p>Шумо метавонед нигоҳдории автоматиро гиронед дар диалоги Пайкарии Umbrello "
-".</p>\n"
+"Номи хусусияте ки шумо интихоб кардед дар амалиёт аллакай истифодашудааст."
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: dialogs/umlentityattributedialog.cpp:193
+#, fuzzy
+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 ""
-"<p>Оё хусуссияте, ки ба шумо лозим аст дар Umbrello вуҷуд дорад? Аз шумо хоҳиш "
-"карда мешавад, ки ба мо гӯед. \n"
-"Ҳар як илова кардан дар ғалатҳои маълумотҳои асос бо Report Bug аз Help menu\n"
-"ё инки равон намудани uml-devel ҳамчун листи электронӣ.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Параметрҳо"
+
+#: 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 ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
-"<p>Шумо метавонед ҳамаи объектҳои интихобшударо бо воситаи зер кардани Несткунӣ "
-"ё ин ки Баргашт нест кунед.</p>\n"
+"Норми параметре ки шумо интихоб кардед\n"
+"дар ин амалиёт аллакай истифодашудааст."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Номи параметр ягона нест"
 
-#: tips.txt:91
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Агар шумо дар Umbrello ягон хатогӣ ёфтед, илтимос моро хабардор кунед. \n"
-"Шумо хатогиҳоро бо обзори Report Bug ба менюи Ёрӣ дохил карда наметавонед.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Номи параметре ки шумо гузоштед аллакай дар амалиёт истифодашудааст."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Шумо номи амалиёти беэтиборро гузоштед."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Номи амалиёт нодуруст"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Амалиёт бо сигнатураи ҳамин гуна аллакай дар %1мавҷуд аст.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Номи дигарро интихоб кунед ё ин ки матни параметрро."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Хусусиятҳои нақш"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Хусусияти қолиб"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Номи нодурусти қолиб."
 
-#: tips.txt:97
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Номи нодурусти қолиб"
+
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Номи параметре ки шумо гузоштед аллакай дар амалиёт истифодашудааст."
+
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "Номи параметр ягона нест"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Параметрҳои тасвир кардани синфҳо"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Рангҳои диаграмма"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Номи воридшуда нодуруст аст."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Ин хел ном аллакай вуҷуд дорад."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Ном якхела нест"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Сатр:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Ранг кардан:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Зикр нашуда"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Рангкунӣ"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Захира кардан мисли тасвир..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p>Ҳангоми пахш намудани калиди Escape маҷмӯъаи абзорҳои ҷорӣ буда ба абзори "
-"интихоб гардида шуда иҷро менамояд.\n"
-"Backspace бошад ба абзори истифодаи пештара мегузарад.</p>\n"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</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 "Ҳангоми нигоҳдории файл хатогӣ рӯй дода шуд: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Нигоҳдории нодуруст"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Муаллифи Umbrello"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Файлро кушоед"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>Шумо метавонед ҳамаи объектҳоро интихоб кунед бо воситаи зер кардани "
-"Ctrl-A.</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
-"<p>Шумо метавонед бунёд ё ин ки гузоштани дарсҳои нав бо истифодаи Дарси Нав "
-"дар Коди меню.</p>\n"
+"(c) 2001 Paul Hensgen, (c) 2002-2004 Гурӯҳи истихроҷкунандаҳои Umbrello "
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Муаллифи Umbrello"
+
+#: 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 "Ном"
+
+#: 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 "Номро ворид созед:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Номи амалиётро ворид кунед:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Матни навро ворид кунед:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ХАТОГӢ"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Дигар кардани матн"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "Файли %1 мавҷуд надорад."
+
+#: 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 "Пурборкунии нодуруст"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Файли %1 зарар расонда шуд."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1696,6 +1863,10 @@ msgstr "Амалиёти нав..."
 msgid "Select Operation..."
 msgstr "Интихоб кардани амалиёт..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Тағйир кардани матн..."
@@ -1747,6 +1918,19 @@ msgstr "Нав"
 msgid "Rename..."
 msgstr "Тағйири ном..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Часпондани хато"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Ранги сатр..."
@@ -1777,14 +1961,26 @@ msgstr "Хатогии дохила"
 msgid "Import Classes..."
 msgstr "Воридот кардани синфҳои C++..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Бастаи нармафзорӣ"
+
 #: 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 "Гиреҳ"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Диаграммаи кушоишҳо..."
@@ -1793,11 +1989,20 @@ msgstr "Диаграммаи кушоишҳо..."
 msgid "Folder"
 msgstr "Каталог"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Фаъолияти охир"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 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 "Диаграммаи назирҳо..."
@@ -1835,6 +2040,18 @@ msgstr "Аттрибути нав..."
 msgid "Export as Picture..."
 msgstr "Захира кардан мисли тасвир..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Итерфейс"
+
+#: 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 "Диаграммаи синфҳо..."
@@ -1855,26 +2072,10 @@ msgstr "Диаграммаи пайдарпаӣ..."
 msgid "Collaboration Diagram..."
 msgstr "Диаграммаи кооператсия..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Атрибутҳо"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Амалиётҳо"
-
 #: 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 "Имзои амалиёт"
@@ -1887,11 +2088,6 @@ msgstr "Имзои аттрибут"
 msgid "Stereotype"
 msgstr "Навъи стереоӣ"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Тасвир намудан"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Аттирибут..."
@@ -1916,14 +2112,6 @@ msgstr "Ранги шероза..."
 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 "Ранг"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Иштирокунанда..."
@@ -1952,10 +2140,26 @@ msgstr "Намуди номбаршуда..."
 msgid "Package..."
 msgstr "Пакет..."
 
+#: 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 "Ҳолат..."
 
+#: 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..."
@@ -2003,6 +2207,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 "Нобуд кардани диаграмма"
@@ -2037,8 +2249,8 @@ 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
@@ -2047,196 +2259,96 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2004 Гурӯҳи истихроҷкунандаҳои Umbrello "
 
-#: 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
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Файли %1 мавҷуд надорад."
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "актёри_нав"
 
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Файли %1 зарар расонда шуд."
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "new_usecase"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"* НПО \"Имкониятҳои ҷавонон\" * Tajik Linux Users Group * Young Ladies Tajik "
-"Linux Users Group * http://www.khujand.org * http://www.tajikngo.org * "
-"http://www.yo-tj.org * Роҷер Ковакс, Виктор Ибрагимов, Марина Колючева, Евгения "
-"Фатхеева, Акмал Ватаншоев, Абророва Хиромон, Акмал Саломов, Акбар Ватаншоев, "
-"Фарход Ахмедов, Эркин Пулатов, Гулшод Довуди, Гулноз Курбанова, Зарина "
-"Косымова, Шухрат Лоиқов, Сурайё Ҷурахонова *"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "пакети_нав"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"rkovacs@khujand.org, youth_opportunities@tajikngo.org, MarinaKL@tajikngo.org"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "компоненти_нав"
 
-#: 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 "Таёр."
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "узели_нав"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "new_artifact"
 
-#: 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 ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "интерфейси_нав"
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr ""
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "намуди маълумот_нав"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "new_enum"
 
-#: codeimport/import_utils.cpp:183
+#: model_utils.cpp:262
 #, fuzzy
-msgid "Namespace"
-msgstr "фосилаи номҳо чашмдошт карда шуд"
+msgid "new_entity"
+msgstr "new_enum"
 
-#: codeimport/classimport.cpp:34
+#: model_utils.cpp:264
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Порид намудани файл: %1"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Хатогии дохила"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Хатогии синтаксии пеш аз '%1'"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Хатогии муҳокимаи грамматикӣ пеш аз '%1'"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "ифода чашмдошт карда мешавад"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Хатогӣ дар эълони синтаксис"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} чашмдошт карда шуд"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "фосилаи номҳо чашмдошт карда шуд"
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "фосилаи номҳо чашмдошт карда шуд"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Номи фосилаи номҳо чашмдошт карда мешавад"
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Шакли мушаххаскунанда барои эълон лозим"
-
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "эълон чашмдошт карда мешавад"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Ифодаи собит чашмдошт карда мешавад"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "')' чашмдошт карда мешавад"
+msgid "new_folder"
+msgstr "узели_нав"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} ғоиб карда шудааст"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "ассотсиатсияи_нав"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Аъзоҳои инисиализаторҳо чашмдошт карда шудаанд"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "мавзуъи_нав"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Мушаххаскунандаи базаи синфӣ чашмдошт карда шудааст"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Таркиби инисиализатсиякунонӣ чашмдошт карда мешавад"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Шиносаи чашмдошт карда мешавад"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Шиносаи шакл чашмдошт карда мешавад"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Номи синф чашмдошт карда мешавад"
+#: 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"
-msgstr "ифодаи ҳолат чашмдор карда мешавад"
+#: 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"
-msgstr "ифода чашмдошт карда мешавад"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "чашмдошти инисиализатсиа барои"
+#: 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"
-msgstr "чашмдошти catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Эҳтиёт намудани калимаи калид"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2250,109 +2362,66 @@ msgstr "Номи объектро гузоред:"
 msgid "new_parameter"
 msgstr "new_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Параметрҳои ҳамагӣ"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Покат барои фазои ном мебошад"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Дохил кардани базаи синфӣ"
 
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Деструктураҳои виртуали"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Дохил кардани синфи баромадшуда"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Ҳосил кардани конструкторҳои холи"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Дохил кардани амалиёт"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Ҳосил кардани роҳи метод ба хусусиятҳо"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Дохил кардани атрибут"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Операсияи дар дарун сохташуда"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Дохил кардани базаи интерфейс"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Роҳи методҳо ба хусусиятҳои дар дарун сохташуда"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Дохил кардани интерфейси баромадшуда"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-#, fuzzy
-msgid "Accessors are public"
-msgstr "Роҳи методҳо ба хусусиятҳои дар дарун сохташуда"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Мақомшиносҳои базавӣ"
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Диаграмма: %2 Саҳифа %1"
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Мақомшиносҳои баромадшуда"
 
-#: umlview.cpp:2578
-#, fuzzy
-msgid "Enter Diagram Name"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
 msgstr "Номи ҳолатро гузоред"
 
-#: umlview.cpp:2579
-#, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "Номи нави фаъолиятро гузоред:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Оё шумо дар ҳақиқат ҳамаи\n"
-" диаграммаҳоро нобуд сохтан мехоҳед?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Диаграммаро нобуд созам?"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr ""
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr ""
-
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Даромадани ном нодастрас мебошад.\n"
-"Номи дигаргузориро рад кард."
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "ассотсиатсияи_нав"
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "аттрибути_нав"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Номи ҳолати навро гузоред:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "new_template"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Фаъолиятро ворид кунед"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "амали_нав"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Имконнопазирии истифодабарии иттиҳод."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "new_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Хатогии иттиҳод"
 
-#: umlcanvasobject.cpp:162
-#, fuzzy
-msgid "new_field"
-msgstr "new_literal"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "ҳолати нав"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2509,11 +2578,6 @@ msgstr "&Экспорт кардани ҳамчун сурат..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Захира кардан мисли тасвир..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Хусусиятҳо"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Тағири андози тасвири слайдер"
@@ -2600,6 +2664,13 @@ msgstr "&Ҳуҷҷатнома"
 msgid "Opening file..."
 msgstr "Кушодани файл..."
 
+#: 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 "Сохтани документи нав..."
@@ -2607,15 +2678,15 @@ msgstr "Сохтани документи нав..."
 #: uml.cpp:673
 #, fuzzy
 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Ҳама файлҳои пуштибон (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Ҳама файлҳои пуштибон (*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2)\n"
 "*.xmi|Нопачақ шудаи XMI Files (*.xmi)\n"
 "*.xmi.tgz|Пачақ шудаи Gzip XMI Файлҳо (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Пачақ шудаи Bzip2 XMI Файлҳо (*.xmi.tar.bz2)"
@@ -2644,6 +2715,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 Пачақ шудаи XMI Файл\n"
 " *|Ҳамаи файлҳо"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2652,6 +2727,10 @@ msgstr ""
 "Файл вуҷуд дорад %1.\n"
 "Онро иваз мехоҳед кунед?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2688,11 +2767,11 @@ msgstr "Даровардани иборат будаи клипборд..."
 
 #: 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 ""
-"Umbrello наметавонад часпонад иборатҳои клипбордро. Чизҳо дар клипборд мумкин "
-"ки намуди хато мебошанд барои часпондан дар ин ҷо."
+"Umbrello наметавонад часпонад иборатҳои клипбордро. Чизҳо дар клипборд "
+"мумкин ки намуди хато мебошанд барои часпондан дар ин ҷо."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2750,1285 +2829,1308 @@ msgstr ""
 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:"
-msgstr "Номи &қисмат:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "аттрибути_нав"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Номи &артифакт:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Номи &шакли гузашташуда:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "амали_нав"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Номи &намуди маълумот:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "new_literal"
 
-#: dialogs/classgenpage.cpp:68
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Entity &name:"
-msgstr "Номи &шакли гузашташуда:"
-
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Номи қолаби чоп:"
-
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Номи пакет:"
-
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "Си&нфи мавҳум"
+msgid "new_field"
+msgstr "new_literal"
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "Си&нфи мавҳум"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Файли фармондиҳӣ"
+msgid "UML Model"
+msgstr "Umbrello"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Нақшакашӣ мисли"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Пешниҳодҳои мантиқӣ"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Пешфарз"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Андеша аз тарафи собиқаҳо"
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Китобхона"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Андеша аз тарафи собиқаҳо"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Ҷадвал"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Андеша аз тарафи кушоиш"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "Ош&кор"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "А&сосӣ"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Намуди маълумотҳо"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&Мудофиакардашуда"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Фйали ҷорӣ тағир дода шуда буд.\n"
+"Нигоҳ дорам?"
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "&Ҳуҷҷатнома"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Файли %1 мавҷуд надорад."
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Номи синф:"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Файли %1 зарар расонда шуд."
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Номи нусхагӣ:"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Файли %1 фишурдашуда дар худ XMI надорад."
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Рассомӣ кардан ҳамчун рӯи коркунанда "
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Ҳангоми пурборкунии файли яла хатогӣ рӯй дода шуд: %1"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Якчанд нусха намудан"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Ҳангоми пурборкунии файл хатогӣ рӯй дода шуд: %1"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Намоиш додани харобкунанда"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Ҳангоми фишор дода даровардани файл ба таҳиягари: %1"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Қисмати ном:"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "Диаграммаҳои собиқаҳо"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Номи гиреҳ:"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Синфи диаграмма"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Номи қолаби чоп:"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+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."
-msgstr ""
-"Ин ном аллакай истифода шуда буд\n"
-"Вай партофтагӣ мебошад."
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "ширкати диаграмма"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Ном аллакай мавҷуд дорад"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "диаграммаи молу мулк"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Сатр:"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "диаграммаи фаъолият"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Ранг кардан:"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "диагараммаи компонентҳо"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Зикр нашуда"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "диаграммаи кушоиш"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Рангкунӣ"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Фаъолиятҳо"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Диаграммаи номи нодастрас."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Фаъолияти нав..."
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Диаграма аллакай ин номро истифода мебарад."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Номро аз сари нав гузоштан"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"Чунин ном аллакай вуҷуд дорад.\n"
+"Шумо дар ҳақиқат ҳаминро мехоҳед?"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Фаъолияти нав"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Собиқа"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Фаъолиятро номгузории дубора кунед"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Номи ҳолатро гузоред"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Номи нави фаъолиятро гузоред:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Шумо мехоҳед ,ки ин диаграммаро нест кунед %1?"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Хусусияти ҷамъиятӣ"
+#: umldoc.cpp:1099
+msgid "Delete 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 "Дурусткуниҳои умумӣ"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Барқароркунии документ..."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Нақшҳо"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Намои нақшҳо"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Пурборкунии элементҳои UML..."
 
-#: 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 "Мизрубҳои навиштаҷот"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Пурборкунии диаграммаҳо..."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Ҳуруфи ҷамъиятӣ"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/автохотиргузори%1"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Хусусияти қолиб"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+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 "Хусусиятҳои умумӣ"
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "Номи ҳолатро гузоред"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Намуд:"
+#: umllistview.cpp:417
+#, fuzzy
+msgid "Enter the new name of the model:"
+msgstr "Номи нави фаъолиятро гузоред:"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Ном:"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Пешниҳодҳо"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Номи нодурусти қолиб."
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Номи ворид карда шуда имконпазир аст.\n"
+"Бунёкунӣ бекор карда шуд."
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Номи нодурусти қолиб"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ном нодуруст аст"
 
-#: dialogs/umltemplatedialog.cpp:138
-#, fuzzy
+#: umllistview.cpp:1923 umllistview.cpp:2160
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Номи параметре ки шумо гузоштед аллакай дар амалиёт истифодашудааст."
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Номи ворид карда шуда аллакай истифода шуда истодааст\n"
+"Бунёдкунӣ бекор карда шуд."
 
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "Номи параметр ягона нест"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Хусусиятҳои аттрибут"
+msgid "Loading listview..."
+msgstr "Пурбори диаграммаҳо..."
 
-#: dialogs/umlentityattributedialog.cpp:73
-#, fuzzy
-msgid "&Default value:"
-msgstr "&Пешфарз"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Каталогро пеш аз нобуд сохтан озод намоед."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr ""
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Каталог холӣ нест"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
-#, fuzzy
-msgid "Attributes:"
-msgstr "Атрибутҳо"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-#, fuzzy
-msgid "&None"
-msgstr "&Нав"
-
-#: dialogs/umlentityattributedialog.cpp:115
-#, fuzzy
-msgid "&Primary"
-msgstr "&Китобхона"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
+"Даромадани ном нодастрас мебошад.\n"
+"Номи дигаргузориро рад кард."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr ""
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Диаграмма: %2 Саҳифа %1"
 
-#: dialogs/umlentityattributedialog.cpp:184
+#: umlview.cpp:2578
 #, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "Шумо номи хусусияти нодурутро гузоштед."
+msgid "Enter Diagram Name"
+msgstr "Номи ҳолатро гузоред"
 
-#: dialogs/umlentityattributedialog.cpp:185
+#: umlview.cpp:2579
 #, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "Номи аттрибут нодуруст"
+msgid "Enter the new name of the diagram:"
+msgstr "Номи нави фаъолиятро гузоред:"
 
-#: dialogs/umlentityattributedialog.cpp:192
-#, fuzzy
+#: umlview.cpp:2736
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
-"Номи хусусияте ки шумо интихоб кардед дар амалиёт аллакай истифодашудааст."
+"Оё шумо дар ҳақиқат ҳамаи\n"
+" диаграммаҳоро нобуд сохтан мехоҳед?"
 
-#: dialogs/umlentityattributedialog.cpp:193
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Диаграммаро нобуд созам?"
+
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "Номи аттрибут ягона нест"
+msgid "Exporting view..."
+msgstr "Баромадан..."
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Тасвир кардан"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Параметрҳои тасвир кардани синфҳо"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Файли интихобшуда %1 аллакай вуҷуд дорад.\n"
+"Шумо онро иваз кардан мехоҳед?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Рангҳои диаграмма"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Файл аллакай вуҷуд дорад"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Номи воридшуда нодуруст аст."
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Натавонистам каталог бунёд созам"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Ин хел ном аллакай вуҷуд дорад."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Диаграмма холӣ мебошад"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Намуд:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Мизроб сохтани Umbrello"
+#: 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:47
-msgid "User Interface"
-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 ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Интерфейси истифодабаранда"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Мавзӯъ"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Ранги сатр:"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Паёми ҳамгомӣ"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Ранги элом нагашта шуда"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Паёми ноҳамгомӣ"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Рангро рехта пур кардан:"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Барчасб"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Ран&ги элом нагашта шуда"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Эъзоҳ"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Васеъгии сатр:"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Қуттӣ"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "&Васеъгии элом нагашта шуда"
+#: worktoolbar.cpp:257
+#, fuzzy
+msgid "Relationship"
+msgstr "Иҷрокунӣ"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Истифода намудани пуркунанда"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Иттиҳоди рости"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Пахш намудани амалиёти сабт барои бекор кардан"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Ба амал меоварад (Алоқа/Баамалбарори)"
 
-#: dialogs/settingsdlg.cpp:112
-#, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "диаграммаи молу мулк"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "Маҳали дидашавандагии хатҳои иттиҳодро нобаён мебошад:"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Автонигоҳдорӣ"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Пахш намудани автонигоҳдорӣ"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Фосилаи автонигоҳдорӣ, дар як дақиқа:"
+msgid "Join"
+msgstr "Фокро/Пайвастан"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Васеъкунии автонигоҳдорӣ:"
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Форк/боҳампайвастан"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Сар додан"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Логотип"
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "Фаъолияти мегузаштаги"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Маслиҳати рӯз"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Паём"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Пурборкунии лоиҳаи охирин"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Оғоз намудани лоиҳаи нав бо:"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Интихоб кардан"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Бе диаграмма"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Синфи диаграмма"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Собиқаҳои диаграмма"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Диаграммаҳои пайдарпаӣ"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Корпоратсияи даиграмма"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Намоиш додани амалиётҳо"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Вазъияти диаграмма"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Фаъолияти диаграмма"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Нобуд кардани диаграмма"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Қисмати диаграмма"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Кушоиши диаграмма"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Ҷамъбаст"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Параметрҳои синф"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Намоиш додани дидаша&ванда"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Намоиш додани атрибутҳо"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Номи иттиҳод"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Намоиш додани амалиётҳо"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Намоиши &қолаби чоп кардан"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Намоиши додани рақами ҷузъбандии артрибут"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Намоиши пакет"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Пешфарз"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Минтақаи аввали дидашаванда"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Минтақаи дидашавандаи атрибутҳои элом нагашта шуда:"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Слеш-Слеш (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Минтақаи дидашавандаи амалҳои элом нагашта шуда:"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Слеш-ситорача (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Генератсияи код"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Услуб:"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Генератсияи код"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Пайдоиши коди C++</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Аз назар гузарондани код"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Пайдоиши тани метод"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Хусусиятҳои амалиёт"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Дар вақти пайдоиши код синфҳои зеринро истифода баред:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Амалиёти мавҳум"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "&Минтақаӣ биноии классификатор (\"static\")"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "вектор"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Тағйирёбанда</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Мудофиакардашуда"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Ҳуҷҷатнома"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "Сатр (QString)"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Параметрҳо"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "сатр"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Па&раметри нав..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Сатр</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Шумо номи параметри нодурустро гузоштед."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Рӯйхат</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Номи параметр нодуруст"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Норми параметре ки шумо интихоб кардед\n"
-"дар ин амалиёт аллакай истифодашудааст."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>глобалӣ?</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Номи параметр ягона нест"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Номи параметре ки шумо гузоштед аллакай дар амалиёт истифодашудааст."
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Номи синф"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Шумо номи амалиёти беэтиборро гузоштед."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Васл кардани файл</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Номи амалиёт нодуруст"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Пайдоиши лоиҳа"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Амалиёт бо сигнатураи ҳамин гуна аллакай дар %1мавҷуд аст.\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "Бунёд кардани файли васлкунии ANT"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Номи дигарро интихоб кунед ё ин ки матни параметрро."
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Ҳосил кардани методҳо ба таври автоматӣ"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Хусусияти нақши А"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Созандаҳои холӣ"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Хусусияти нақши В"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Методҳои дастрасӣ ба иттиҳод"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Дидашавандаи нақши А"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Методҳои дастрасӣ ба махсусиятҳо"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Дидашавандаи нақши В"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Аз объекти волидайн"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Имкони тағир додани нақши А"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Маҳали дидашавандагии методҳои дастрасӣ ба махсусиятҳо нобаён мебошад:"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Имкони тағир додани нақши В"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "Маҳали дидашавандагии хатҳои иттиҳодро нобаён мебошад:"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Мавзӯи нуқтаҳо"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Аз нақши волидайн"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Аз назар гузаронидани ҳуҷҷатҳо"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Ҳосил кардани код дар Java</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Атрибут бунёд кардан..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "А&малиёти нав..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Қолибҳо"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Пайдоиши коди C++</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "&Қолиби нав..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Забон"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Константаҳои гузаронидашуда"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Каталогҳо"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "&Константаи гузаронидашударо илова кардан..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Нигоҳ доштани файлҳои ҳосил кардашуда дар каталог:"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Атрибутҳо"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Доир&аи назар..."
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "&Атрибут бунёд кардан..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Доир&аи назар..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Фаъолияти аввалин"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Васл кардани файлҳои сарлавҳагӣ аз каталог:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Охири фаъолият"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Файлҳои ҳосилшуда дар ҳамин каталог нигоҳ дошта мешаванд"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Шакли фаъолият:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Файлҳои ҳамин каталог дар вақти пайдоиши код мисли файлҳои сарлавҳагӣ "
+"истифода бурда мешаванд"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ному насаби фаъолият:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Файлҳои вуҷуд буда"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Рангҳои васеъкунӣ"
+#: 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 ""
+"Агар файл бо номи, ки бо генератори код \n"
+" истифода бурда мешавад, аллакай вуҷуд дошта бошад:"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Хусусиятҳои аттрибут"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "И&ваз кардан"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Маънои аввалин:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Иваз кардани файлҳои вуҷуд буда"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Ошкор"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Пур&сидан"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Шумо номи хусусияти нодурутро гузоштед."
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr ""
+"Агар файл бо ҳамин гуна ном аллакай вуҷуд дошта бошад, он гоҳ дар бораи "
+"амалҳои минбаъд пурсед"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Номи аттрибут нодуруст"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Номи дигарро интихоб кунед"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Номи аттрибут ягона нест"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Зинату ороиш"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Амалро интихоб намоед"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Сатрҳо"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Рақами пайравикунанда:"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Охири сатр:"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Амалиёти синфӣ:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Навъи фосилаҳо:"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Дигар амал:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Миқдори аломатҳо:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Диаграммаҳо "
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Филтр"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Диаграммаи ҷоришаванда"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Ҳамаи диаграммаҳо"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Бефосила"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Ҷудо намудани диаграммаҳо"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Табулятсия"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Намуди диаграммаҳо"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Фосила"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Ҷудокунӣ"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Эзоҳоти Муфассалӣ"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Кооператсия"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Навиштани эзоҳот &барои шӯъбаҳо ҳатто агар \n"
+"онҳо холӣ бошанд"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Пайдарпаӣ"
+#: 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "Андеша аз тарафи кушоиш"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Навистани шарҳи ҳуҷҷатҳо ҳатто онҳо холӣ ҳам бошанд"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Диаграммаҳои интихоб карда шуда мавҷуд надорад."
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Навистани шарҳ барои &синфҳо ва методҳо ҳатто онҳо холӣ ҳам бошанд"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Намоиши интихобҳо"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Параметрҳои забон"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Танзимотҳои аттрибут"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Устои пайдоиши рамз"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Танзимотҳои амалиёт"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Интихоби синфҳо"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Танзимотҳо қолибҳо"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Ҳамаи синфҳоро бо хоҳиши худ барои пайдоиши код гузоред\n"
+"барои дар дасти рости тарафи саҳифа"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Шакли константаҳои гузаронидашуда"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Илова кардани синф барои пайдоиши рамз"
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Танзимотҳои аттрибут"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Синфҳои интихобшуда"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Танзимотҳои мундариҷа"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Кӯр кардани синф аз ҳосилкунии код"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Ширкатҳо"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Синфҳои дастрас"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Ширкатҳои синфӣ"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Ҳолати пайдоиши рамз"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Амалиётҳо"
+#: dialogs/codegenerationwizardbase.ui:226
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Пахш кардани тугмаи пайдоиш барои оғоз намудани пайдоиши код"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Дидашаванда"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Ҳолати пайдоиш"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Рақами ҷузъбан&дии амалиёт"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Тасвир кардани блокҳои пинҳон"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Пакет"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">дар ин ҷо номи қисмат</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&Артрибутҳо"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Қолаби чоп"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Тасвир кардани навъи блок"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Рақами ҷузъ&бандии артрибут"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Рангҳо"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Расм кашидан ҳамчун марказнок"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Ҳарф:"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Вазъияти аввал"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Қоғаз:"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Вазъияи охирин"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Ҷудокунӣ:"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Навъи ҳолат:"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Блоки объекти UML:</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Номи ҳолат:"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Блоки пинҳонӣ:</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Ранги васеъкунӣ"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Матни тағйирнашаванда:</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "синфи_нав"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Матни ивазшаванда:</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Синфи нав"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Хусусиятҳои диаграмма"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Аттрибутҳои синфӣ"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Калон кунӣ:"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Амалиётҳои синфӣ"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Хусусиятҳои параметр"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Намоиши &шабака"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Ба шабака &бастан"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Бастани андозаи қисматҳо"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+"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 ""
+"Тасвири лаҳзаи андозаи қисматҳо метавонад чандин тӯри фосилагузорӣ дошта "
+"бошад.\n"
+"Агар тасвири лаҳза ба тӯри  фосилагузаранда тавоно сохтани қисматҳо ҳамавақт "
+"ба тӯри ҳамаи он 4 тарафҳо саф оварда мешаванд."
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Генерирондан"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Ба охир расид"
-
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Код генерирондашуда"
-
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ногенерирондашуда"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Интервали шабака:  "
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ҳоло гененерирондашудаги нест"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Луғати %1 дар мавҷуд нест. Мехоҳед ки ӯро эҷод кунед?"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Луғати охирин дар мавҷуд нест"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Бари сатр:  "
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Натавонистам каталог бунёд созам"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Захира кардан мисли тасвир..."
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "&Файлро пешниҳод накунед"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:168
-#, fuzzy
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
-"Луғатро эҷод карда натавонист.\n"
-"Бовари ҳосил кунед ки, шумо тамоми навишти ҳуқуқиро дар луғатаи модариаш дошта "
-"бошед."
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Хатоги дар эҷод кардани луғат"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Навъи ҳолат:"
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "Лутфан номи луғатро интихоб кунед."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "каталог"
 
-#: dialogs/codegenerationwizard.cpp:184
-#, fuzzy
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"Каталоги хуруҷӣ мавҷуд аст,аммо дар навмуди навишта нест.\n"
-"Лутфан махсусияшро гузоред ё ин ки каталоги дигарро интихоб кунед."
-
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Хатогии сабт дар рӯйхати охирин"
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 рӯйхат хисобида намешавад."
-
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "рӯйхати имконпазирро интихоб кунед"
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Охирини парванда аллакай мавҷуд аст"
-
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
+"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 ""
-"Парвандаи %1 аллакай дар %2 мавҷуд аст.\n"
-"\n"
-"Шумо метавонед ки парвандаро алиш кунед,парвандаро нигоҳ доред бо номи дигар,ё "
-"ин ки ин парвандаро тамоман нагенериронед."
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Ба ҳамаи файлҳои гузашта гузаред"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Иваз кардан"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Ҳамин гуна номи файлро пешниҳод кунед"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Файлро пешниҳод накунед"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Параметрҳои имконпазир мавҷуд надорад.</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Бисёрӣ"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Бисёриро гузоред:"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Номи иттиҳод"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Номи иттиҳодро гузоред:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Номи нақш"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Имконпазирии ивазкунии нақш"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Номи нақшро гузоред:"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Дидашавандагии нақш"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Номи амалиётро ворид кунед:"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Матни навро ворид кунед:"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ХАТОГӢ"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Диаграмма"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Дигар кардани матн"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Нав"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Ба канори чап рост намоед"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "На&моиш"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Ба канори рост рост намоед"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Калон кунӣ:"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Ба канори боло рост намоед"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Рамз"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Ба канори поёни рост намоед"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Забони &фаъолият"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Рост намудан ба таври амудӣ (дар байни киёниҳо)"
+#: 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 ""
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Рост намудан ба таври уфуқӣ (дар байни киёниҳо)"
+#: 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 ""
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Рост намудан ба таври амудӣ (дар байни киёниҳо)"
+#: 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 ""
 
-#: aligntoolbar.cpp:47
+#: tips:23
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Рост намудан ба таври уфуқӣ (дар байни киёниҳо)"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<p>Most diagram items can not be resized, they will resize themselves to fit "
+"to their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and "
+"drag on the red square.</p>\n"
 msgstr ""
-"Рост намоиро метавонед камаш ба бо ду объект иҷро намоед, масалан синфҳо ва ё "
-"актёр.Барои иттиҳодҳо росткунӣ номумкин аст."
+"<p>Бисёри қалами диаграммаҳо наметавон дубора андоза гузошт, онҳо худсарона "
+"аз нав андоза бо дигар қисматҳо мувоффиқ оянд.\n"
+"Қуттиҳо, сабтҳо ва тартиби мактубҳои диаграмма ҳангоми пахш намудан аз нав "
+"андоза гузошта мешавад ва бо майдони сурх кашида мешавад.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:30
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Ин забони фаъоли хизмат эҳтиётӣ аст."
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Эҳтиёт намудани калимаи калид"
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr ""
+"<p>Агар шумо мехоҳед, ки синфи вуҷудшударо дар диаграмма дохил кунед, фақат "
+"ӯро аз синфи дарахт ба чап гузаронед.</p>\n"
 
-#: umlviewimageexporter.cpp:46
+#: tips:36
 #, fuzzy
-msgid "Exporting view..."
-msgstr "Баромадан..."
-
-#: umlviewimageexporter.cpp:50
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
 msgstr ""
+"<p>Umbrello нави омилбандии иҷрогар иҷозат медиҳад, ки шумо амалро байни "
+"синф ҳаракат дод ва онро боз қабул намояд ва асоси\n"
+" синфҳоро ҳам.\n"
+"Пахши дурусти синф омилбандии иҷрогарро метавон кушод.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:44
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Файли интихобшуда %1 аллакай вуҷуд дорад.\n"
-"Шумо онро иваз кардан мехоҳед?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Файл аллакай вуҷуд дорад"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "актёри_нав"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "new_usecase"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "пакети_нав"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "компоненти_нав"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "узели_нав"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "new_artifact"
+"<p>Объектҳои диаграммаҳои баромадшуда метавонанд блоки деструктура ва дар "
+"намуди иштирокшавандаҳо кашида шуда, дошта бошанд. Пахши дубора ба кушодани "
+"маълумотҳо меоварад.</p>\n"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "интерфейси_нав"
+#: 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 ""
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "намуди маълумот_нав"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "new_enum"
+#: 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 ""
 
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "new_enum"
+#: 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 ""
+"<p>Буридан ва нусха намудан тасвирро ба забонаки PNG содир менамояд, вале "
+"кадоме ки дар KWord гузошта шудааст\n"
+"ва дар дигар барномаҳо.</p>\n"
 
-#: model_utils.cpp:264
+#: tips:78
 #, fuzzy
-msgid "new_folder"
-msgstr "узели_нав"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "мавзуъи_нав"
-
-#: model_utils.cpp:559
-msgid "Empty"
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
 msgstr ""
+"<p>Пайвастагиҳо набояд дар хатҳои рост бошанд,\n"
+"нуқта.</p>\n"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
+"<p>Шумо метавонед нигоҳдории автоматиро гиронед дар диалоги Пайкарии "
+"Umbrello .</p>\n"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: 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 ""
+"<p>Оё хусуссияте, ки ба шумо лозим аст дар Umbrello вуҷуд дорад? Аз шумо "
+"хоҳиш карда мешавад, ки ба мо гӯед. \n"
+"Ҳар як илова кардан дар ғалатҳои маълумотҳои асос бо Report Bug аз Help "
+"menu\n"
+"ё инки равон намудани uml-devel ҳамчун листи электронӣ.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 msgstr ""
+"<p>Шумо метавонед ҳамаи объектҳои интихобшударо бо воситаи зер кардани "
+"Несткунӣ ё ин ки Баргашт нест кунед.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: 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 ""
+"<p>Агар шумо дар Umbrello ягон хатогӣ ёфтед, илтимос моро хабардор кунед. \n"
+"Шумо хатогиҳоро бо обзори Report Bug ба менюи Ёрӣ дохил карда наметавонед.</"
+"p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: 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 ""
+"<p>Ҳангоми пахш намудани калиди Escape маҷмӯъаи абзорҳои ҷорӣ буда ба абзори "
+"интихоб гардида шуда иҷро менамояд.\n"
+"Backspace бошад ба абзори истифодаи пештара мегузарад.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Дохил кардани базаи синфӣ"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Дохил кардани синфи баромадшуда"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Дохил кардани амалиёт"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Дохил кардани атрибут"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Дохил кардани базаи интерфейс"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Дохил кардани интерфейси баромадшуда"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Мақомшиносҳои базавӣ"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Мақомшиносҳои баромадшуда"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Натавонистам каталог бунёд созам"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Диаграмма холӣ мебошад"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>Шумо метавонед ҳамаи объектҳоро интихоб кунед бо воситаи зер кардани Ctrl-"
+"A.</p>\n"
 
-#: 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 ""
+"<p>Шумо метавонед бунёд ё ин ки гузоштани дарсҳои нав бо истифодаи Дарси Нав "
+"дар Коди меню.</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "new_stereotype"
@@ -4064,7 +4166,8 @@ msgstr ""
 #~ "Please select one of the installed languages to generate the code with."
 #~ msgstr ""
 #~ "Забони фаъол ёфт нашуд.\n"
-#~ "Интихоб кунед яке аз забонҳое, ки дуруст кардашударо барои ҳосил кардани код бо."
+#~ "Интихоб кунед яке аз забонҳое, ки дуруст кардашударо барои ҳосил кардани "
+#~ "код бо."
 
 #, fuzzy
 #~ msgid "UMLRolePropertiesBase"
diff --git a/tde-i18n-tr/messages/tdesdk/umbrello.po b/tde-i18n-tr/messages/tdesdk/umbrello.po
index b8db383f7c4..13a4b092bd0 100644
--- a/tde-i18n-tr/messages/tdesdk/umbrello.po
+++ b/tde-i18n-tr/messages/tdesdk/umbrello.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
 "Report-Msgid-Bugs-To: \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-10-24 02:48+0300\n"
 "Last-Translator: Görkem Çetin <gorkem@kde.org>\n"
 "Language-Team: Türkçe <kde-i18n-tr@kde.org>\n"
@@ -18,256 +18,202 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML Modelleyici Yazarları"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Görkem Çetin"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "açılacak dosya"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gorkem@kde.org"
 
-#: 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
-#, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2001 Paul Hensgen, (c) 2002-2003 Umbrello UML Modelleyici Yazarları"
+#: 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 "Yeni etkinliğin adını girin:"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML Modelleyici Yazarları"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Resim Olarak Kaydet..."
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+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:42
+msgid "Align Top"
 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"
-msgstr "Programı kaydederken bir hata oluştu: %1"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+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 "Kaydetme Hatası"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
+msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Nesne"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
+msgstr ""
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Senkron Mesaj"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
+msgstr ""
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asenkron Mesaj"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
+msgstr ""
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Bağıntı"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
 
-#: association.cpp:93 worktoolbar.cpp:249
+#: aligntoolbar.cpp:384
 #, fuzzy
-msgid "Containment"
-msgstr "Bileşen"
-
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Çapa"
-
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Etiket"
+msgid "Information"
+msgstr "Biçimlendirme"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Not"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kutu"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Genelleştirme"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Aktör"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
 
 #: association.cpp:86 worktoolbar.cpp:255
 msgid "Dependency"
 msgstr "Bağımlılık"
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
-msgstr ""
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Bağıntı"
 
-#: worktoolbar.cpp:257
+#: association.cpp:88
 #, fuzzy
-msgid "Relationship"
-msgstr "Gerçekleme"
+msgid "Self Association"
+msgstr "Bağıntıyı Sil"
 
-#: worktoolbar.cpp:258
+#: association.cpp:89
 #, fuzzy
-msgid "Directional Association"
-msgstr "yeni_bağıntı"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr ""
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Bileşim"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Use Case"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Sınıf"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Başlangıç Durumu"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Bitiş Durumu"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Ayrıl/Birleş"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr ""
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Bileşen"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Düğüm"
-
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr ""
-
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Arayüz"
-
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Veri türü"
+msgid "Collaboration Message"
+msgstr "Diyagramlar yükleniyor.."
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#: association.cpp:90
 #, fuzzy
-msgid "Enum"
-msgstr "Yeniden Adlandır"
+msgid "Sequence Message"
+msgstr "Sıralı Diyagram"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#: association.cpp:91
 #, fuzzy
-msgid "Entity"
-msgstr "Bitiş Aktivitesi"
+msgid "Collaboration Self Message"
+msgstr "Diyagramlar yükleniyor.."
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+#: association.cpp:93 worktoolbar.cpp:249
+#, fuzzy
+msgid "Containment"
+msgstr "Bileşen"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr ""
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Bileşim"
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "Dizin"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Gerçekleme"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Çapa"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Durum Aktarımı"
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Etkinlik geçişi"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Etkinlik"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Durum"
-
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Bitiş Aktivitesi"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Mesaj"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Bağıntı Adı"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Bağıntı adını girin:"
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Rol Adı"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
 msgstr ""
 
-#: worktoolbar.cpp:302
-#, fuzzy
-msgid "Select"
-msgstr "Seçim"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Bu geçersiz bir isim."
+
+#: 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 "Geçersiz İsim"
+
+#: 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 "Bu isim halen kullanılıyor."
+
+#: 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 ""
 
 #: 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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -285,10 +231,8 @@ msgid "Cannot Open File"
 msgstr "Dosya Açılamadı"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Dzin oluşturulamadı:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Dzin oluşturulamadı:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -302,1286 +246,1545 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Dizin Oluşturulamadı"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:36
+#, fuzzy
+msgid "General Options"
+msgstr "Genel ayarlar"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr ""
+#: codegenerators/cppcodegenerationform.cpp:38
+#, fuzzy
+msgid "Package is a namespace"
+msgstr "Paket adı:"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
 msgstr ""
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Yeni etkinliğin adını girin:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr ""
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "yeni etkinlik"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr ""
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: codegenerators/cppcodegenerationform.cpp:50
 #, fuzzy
-msgid "UML Model"
-msgstr "Umbrello UML Modelleyici"
-
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Mantıksal Görünüm"
-
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Use Case Görünümü"
+msgid "Operations are inline"
+msgstr "Geçersiz İşlem Adı"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Bileşen Görünümü"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
 msgstr ""
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
 msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Veri türleri"
+#: 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 "Hazır."
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
-"Geçerli dosya değiştirildi.\n"
-"Bunu kaydetmek istiyor musunuz?"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "%1 dosyası bulunamadı."
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr ""
 
-#: 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 "Yükleme Hatası"
+#: codeimport/import_utils.cpp:183
+#, fuzzy
+msgid "Namespace"
+msgstr "yeni_paket"
 
-#: umldoc.cpp:380
+#: 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 "Sınıf"
+
+#: codeimport/kdevcppparser/errors.cpp:23
 #, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "%1 dosyası bulunamadı."
+msgid "Internal Error"
+msgstr "Yapıştırma Hatası"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: umldoc.cpp:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Programı yüklerken bir hata oluştu: %1"
-
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Programı yüklerken bir hata oluştu: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
 msgstr ""
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "use case diyagramı"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "sınıf diyagramı"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "sıra diyagramı"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+#, fuzzy
+msgid "} expected"
+msgstr "Seçili:"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
 msgstr ""
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "durum diyagramı"
+#: codeimport/kdevcppparser/parser.cpp:688
+#, fuzzy
+msgid "{ expected"
+msgstr "Seçili:"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "etkinlik diyagramı"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "bileşen diyagramı"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
+#: codeimport/kdevcppparser/parser.cpp:938
+#, fuzzy
+msgid "expected a declaration"
+msgstr "İşlemi Seçin"
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
 msgstr ""
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
 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 "İsim"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "İsim girin:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Bu bir diyagram için geçersiz bir isim."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Geçersiz İsim"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Başka bir diyagram bu ismi kullanıyor."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+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"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
 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."
-msgstr "Bu geçersiz bir isim."
+#: codeimport/kdevcppparser/parser.cpp:2374
+#, fuzzy
+msgid "Class name expected"
+msgstr "Seçilen Sınıflar"
 
-#: 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 "Bu isim halen kullanılıyor."
+#: 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:1067 umllistview.cpp:1916
-#, fuzzy
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
 msgstr ""
-"Girilen isim geçersiz!\n"
-"İsim değiştirme işlemi iptal edildi."
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Bu İsim Kullanılıyor"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Use Name"
-msgstr "Use Case"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: 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 "Enter New Name"
-msgstr "İsim girin:"
+msgid "Properties"
+msgstr "Ö&zellikler"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "%1 diyagramını silmek istediğinize emin misiniz?"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "İlk etkinlik"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Diyagramı Sil"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Bitiş etkinliği"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Belge düzenleniyor..."
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Ayrıl/Birleş"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
 msgstr ""
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "UML öğeleri yükleniyor..."
+#: 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 "Genel"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Diyagramlar yükleniyor.."
+#: 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 "Genel Özellikler"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "TDE UML Diyagramı"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Etkinlik türü:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr ""
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Etkinlik adı:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: 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 "Belgeler"
 
-#: umllistview.cpp:416
+#: 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 "Enter Model Name"
-msgstr "İsim girin:"
+msgid "Font"
+msgstr "Yazıtipi:"
 
-#: umllistview.cpp:417
-#, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "Aktivitenin yeni adını yazın:"
+#: 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 "Yazıtipi Ayarları"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Görünümler"
+#: 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 "Renk"
 
-#: umllistview.cpp:1906
-#, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Girilen isim geçersiz!\n"
-"İsim değiştirme işlemi iptal edildi."
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Parçacık Renkleri"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Geçersiz İsim"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Etkinlikler"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Yeni Etkinlik..."
+
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
 #, fuzzy
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Girilen isim geçersiz!\n"
-"İsim değiştirme işlemi iptal edildi."
+msgid "Delete"
+msgstr "Çapayı Sil"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Yeniden Adlandır"
 
-#: umllistview.cpp:2338
-#, fuzzy
-msgid "Loading listview..."
-msgstr "Diyagramlar yükleniyor.."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Yeni Etkinlik"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr ""
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "yeni etkinlik"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Dizin Boş Değil"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Etkinliği Yeniden Adlandır"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Aktivitenin yeni adını yazın:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr ""
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "İsim:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tür:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Bağıntılar"
+
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
 msgstr ""
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Genelleştirme"
+#: 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 "Genel Ayarlar"
 
-#: association.cpp:88
-#, fuzzy
-msgid "Self Association"
-msgstr "Bağıntıyı Sil"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Roller"
 
-#: association.cpp:89
-#, fuzzy
-msgid "Collaboration Message"
-msgstr "Diyagramlar yükleniyor.."
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr ""
 
-#: association.cpp:90
-#, fuzzy
-msgid "Sequence Message"
-msgstr "Sıralı Diyagram"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Bağıntı yazıtipi"
 
-#: association.cpp:91
-#, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Diyagramlar yükleniyor.."
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr ""
 
-#: association.cpp:92
-msgid "Sequence Self Message"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
 msgstr ""
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Gerçekleme"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr ""
 
-#: association.cpp:96
-msgid "Uni Association"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
 msgstr ""
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diyagram"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr ""
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&New"
-msgstr "&Yeni"
+msgid "Rolename:"
+msgstr "Rol adı:"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Sh&ow"
-msgstr "&Göster"
+msgid "Multiplicity:"
+msgstr ""
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: 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 "&Code"
-msgstr "&Kod"
+msgid "Public"
+msgstr "Genel"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: 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 "Active &Language"
-msgstr "&Etkin Dil"
+msgid "Private"
+msgstr "Özel"
 
-#. 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
+#: 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 "Documentation"
+msgid "Protected"
+msgstr "Korumalı"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
 msgstr "Belgeler"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr ""
+msgid "Changeable"
+msgstr "Değiştirilebilir"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr ""
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, fuzzy, no-c-format
-msgid "Style:"
-msgstr "Yol Biçemi"
+msgid "Frozen"
+msgstr "Donmuş"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
+msgid "Add only"
+msgstr "Sadece ekleme"
+
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Sınıf &adı:"
+
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Aktör &adı:"
+
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Paket a&dı:"
+
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Use case adı:"
+
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Arayüz adı:"
+
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Bileşen adı:"
+
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
 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 "Genel"
+#: dialogs/classgenpage.cpp:64
+#, fuzzy
+msgid "Enum &name:"
+msgstr "İsim girin:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Method Body Generation"
-msgstr "Kod Oluşturma"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Veri tipi adı:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
+#: dialogs/classgenpage.cpp:68
+#, fuzzy
+msgid "Entity &name:"
+msgstr "İsim girin:"
+
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "&Stereotip adı:"
+
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "&Paket adı:"
+
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "vector"
-msgstr "Aktör"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "Ç&alıştırılabilir"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "<b>Variable</b>"
-msgstr "Sınıf adı:"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Farklı Çiz"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, fuzzy, no-c-format
-msgid "..."
-msgstr "Uç..."
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Ö&ntanımlı"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
 #, fuzzy, no-c-format
-msgid "QString"
-msgstr "string"
+msgid "&File"
+msgstr "&Doldur:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Kütüphane"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tablo"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Görünürlük"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Genel"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "Ö&zel"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&Korumalı"
+
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "&Belgeler"
+
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Sınıf adı:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Aktör olarak çiz"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
+#: dialogs/classgenpage.cpp:284
+#, fuzzy
+msgid "Show destruction"
+msgstr "İşlemleri göster"
+
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Bileşen adı:"
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Düğüm adı:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Stereotip adı:"
+
+#: 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 ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, fuzzy, no-c-format
-msgid "qstring.h"
-msgstr "string"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Öznitelikler"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Class name"
-msgstr "Sınıf adı:"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Yeni Öznitelik..."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr ""
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "İşlemler"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Project Generation"
-msgstr "Kod Oluşturma"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "&Yeni İşlem..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Yeni bir dosya oluştururur"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Şablonlar"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "&Yeni Şablon..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, fuzzy, no-c-format
-msgid "Association accessor methods"
-msgstr "Bağıntı Adı"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "Öznitelikler"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, fuzzy, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Öznitelik Özellikleri"
+#: dialogs/classifierlistpage.cpp:51
+#, fuzzy
+msgid "N&ew Entity Attribute..."
+msgstr "&Yeni Öznitelik..."
 
-#. 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 "Genel"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Çapayı Sil"
 
-#. 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 "Özel"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "Ö&zellikler"
 
-#. 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 "Korumalı"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Göster"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr ""
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "İş&lemler"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "İşlemi Seçin"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Görünürlük"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "İşlemi Seçin"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "İşle&m imzası"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr ""
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Paket"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr ""
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Özn&itelikler"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr ""
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Stereotip"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr ""
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Öznitelik imzası"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Çember olarak çiz"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Görünüm"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Görünüm Seçenekleri"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Öznitelik Ayarları"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "İşlem Ayarları"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Şablon Ayarları"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "Öznitelik Ayarları"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Bileşen"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "İçerik Ayarları"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Sınıf Bağıntıları"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "yeni_sınıf"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Yeni Sınıf"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Sınıf Öznitelikleri"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Sınıf İşlemleri"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Kod Oluşturma Seçenekleri"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Dil"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Oluştur"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Dizinler"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Tamamla"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kod Oluşturuldu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Gözat..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Oluşturulmadı"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "Gö&zat..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Henüz Oluşturulmadı"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "%1 dizini mevcut değil. Bunun üzerine yazmak istiyor musunuz?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Çıktı Dizini Mevcut Değil"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Dizin Oluşturulamadı"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "&Dosya Oluşturma"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"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 dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Dizin Oluşturulmasında Hata"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "Lütfen geçerli bir dizin adı seçiniz."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "Ü&zerine yaz"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "Çıktı Dizinine Yazılmasında Hata"
 
-#. 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/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Sor"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "Lütfen Geçerli Bir Dizin Seçiniz"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
+msgid "Code Viewer"
+msgstr "Kod İzleyici"
+
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Farklı bir isim kullan"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diyagramlar"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtre"
+
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Güncel diyagram"
+
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Tüm diyagramlar"
+
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Diyagramları seç"
+
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "D&iyagram türü"
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Seçim"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Use Case"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Biçimlendirme"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sıra"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Satır"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Durum"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Bileşen"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Girinti türü:"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "TDE UML Diyagramı"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Girinti miktarı:"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Hiç diyagram seçilmedi."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr "Pencereler"
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Not Belgesi"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Hedef Dosya Mevcut"
+
+#: 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."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Girinti Yok"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Kalan tüm dosyalara uygula"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Sekme"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Ü&zerine yaz"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Boşluk"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Benzer Bir Dosya Adı Oluştur"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr ""
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Dosya Oluşturma"
 
-#. 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/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Parametre Özellikleri"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tür:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "İsi&m:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "İ&lk değer:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"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 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
 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"
-msgstr ""
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "İşlemi Seçin"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Dil Seçenekleri"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Sıra numarası:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Kod Oluşturma Sihirbazı"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Sınıf işlemi:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Sınıfları Seç"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Özel işlem:"
 
-#. 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"
-msgstr ""
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Umbrello Kurulumu"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr ""
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Kullanıcı Arayüzü"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Seçilen Sınıflar"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Kullanıcı Arayüzü Ayarları"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr ""
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Satır rengi:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Mevcut Sınıflar"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Ö&ntanımlı Renk"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Kod Oluşturma Durumu"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Doldurma rengi:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr ""
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Ön&tanımlı Renk"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Oluşturma Durumu"
+#: dialogs/settingsdlg.cpp:73
+#, fuzzy
+msgid "Line width:"
+msgstr "Satır:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Kod İzleyici"
+#: dialogs/settingsdlg.cpp:81
+#, fuzzy
+msgid "D&efault Width"
+msgstr "Ö&ntanımlı"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
 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:102
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Blok türünü göster"
+#: dialogs/settingsdlg.cpp:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "&Otomatik kaydetmeyi etkinleştir"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Renkler"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "durum diyagramı"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Yazıtipi:"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Kağıt:"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "İşlemi Seçin"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Seçili:"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Otomatik kaydet"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Otomatik kaydetmeyi etkinleştir"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr ""
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Otomatik kaydetme zaman aralığını seç (dakika):"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
+#: dialogs/settingsdlg.cpp:148
+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>"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Diyagram Özellikleri"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "İsim:"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Başlangıç"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Odakla:"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Başlangıç logosu"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Günün ipucu"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
-msgstr "İşlem imzasını göster"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Son projeyi yükle"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Kılavuzları &göster"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Yeni bir projeye başla:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Kılavuza uydur"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Diyagram Yok"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr ""
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Sınıf Diyagramı"
 
-#. 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."
-msgstr ""
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Use Case Diyagramı"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, fuzzy, no-c-format
-msgid "Grid spacing:  "
-msgstr "Kılavuz aralığı: X"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Sıralı Diyagram"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Durum Diyagramı"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, fuzzy, no-c-format
-msgid "Line width:  "
-msgstr "Satır:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Etkinlik Diyagramı"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Resim Olarak Kaydet..."
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Bileşen Diyagramı"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
 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/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Sınıf Ayarları"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Durum türü:"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Öznitelikleri göster"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "İşlemleri göster"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "dizin"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "&Sterotipleri göster"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Öznitelik imzalarını göster"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Paketi göster"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
-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)."
+msgid "Show operation signature"
+msgstr "İşlem imzasını göster"
+
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
 msgstr ""
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Rol Özellikleri"
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "İşlemi Seçin"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Rol adı:"
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "İşlemi Seçin"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr ""
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Kod Oluşturma"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Rol Değiştirilebirliği"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Kod Oluşturma Ayarları"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Sadece ekleme"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Kod Görüntüleyici Ayarları"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Donmuş"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "İlk durum"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Değiştirilebilir"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Bitiş durumu"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Rol Görünürlüğü"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Durum türü:"
 
-#. 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 "Belgeler"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Durum adı:"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Parçacık Rengi"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Öznitelik Özellikleri"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#: tips.txt:14
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Genel"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Korumalı"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "&Belgeler"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Geçersiz bir öznitelik adı verdiniz."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Öznitelik Adı Geçersiz"
+
+#: dialogs/umlattributedialog.cpp:163
 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"
+"The attribute name you have chosen is already being used in this operation."
 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/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Öznitelik Adı Geçersiz"
+
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
+msgstr "Öznitelik Özellikleri"
+
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "Ö&ntanımlı"
+
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 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/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
 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/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 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/umlentityattributedialog.cpp:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "Öznitelikler"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 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/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "&Yeni"
+
+#: dialogs/umlentityattributedialog.cpp:115
+#, fuzzy
+msgid "&Primary"
+msgstr "&Kütüphane"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 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/umlentityattributedialog.cpp:121
+msgid "&Unique"
 msgstr ""
 
-#: tips.txt:53
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+msgstr "Geçersiz bir öznitelik adı verdiniz."
+
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "Öznitelik Adı Geçersiz"
+
+#: dialogs/umlentityattributedialog.cpp:192
+#, fuzzy
 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"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "Verilen parametre adı bu işlemde zaten kullanılıyor."
+
+#: dialogs/umlentityattributedialog.cpp:193
+#, fuzzy
+msgid "Entity Attribute Name Not Unique"
+msgstr "Öznitelik Adı Geçersiz"
+
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "İşlem Özellikleri"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 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"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#: tips.txt:66
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametreler"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "&Yeni Parametre..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Geçersiz bir parametre adı verdiniz."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Geçersiz Parametre Adı"
+
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
 
-#: tips.txt:71
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Parametre Adı Kullanılıyor"
+
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Verilen parametre adı bu işlemde zaten kullanılıyor."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Geçersiz bir işlem adı girdiniz."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Geçersiz İşlem Adı"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: tips.txt:76
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Farklı bir isim ya da parametre listesi kullanın."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Rol Özellikleri"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Şablon Özellikleri "
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Geçersiz bir şablon adı girdiniz."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Geçersiz Şablon Adı"
+
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
 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"
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Verilen parametre adı bu işlemde zaten kullanılıyor."
+
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "Parametre Adı Kullanılıyor"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Sınıf Görünüm Seçenekleri"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Diyagram Renkleri"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Verdiğiniz isim geçerli değildir."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Verdiğiniz isim başka bir isimle çakışıyor."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Bu İsim Kullanılıyor"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Satır:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Doldur:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "Ö&ntanımlı"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
 msgstr ""
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Resim Olarak Kaydet..."
+
+#: 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: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"
+#: 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 "Programı kaydederken bir hata oluştu: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Kaydetme Hatası"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML Modelleyici Yazarları"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "açılacak dosya"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:97
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
+"(c) 2001 Paul Hensgen, (c) 2002-2003 Umbrello UML Modelleyici Yazarları"
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML Modelleyici Yazarları"
+
+#: 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 "İsim"
+
+#: 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 "İsim girin:"
+
+#: floatingtextwidget.cpp:112
+#, fuzzy
+msgid "Enter operation name:"
+msgstr "Bağıntı adını girin:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
 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"
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
 msgstr ""
 
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Metni Değiştir"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "%1 dosyası bulunamadı."
+
+#: 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 "Yükleme Hatası"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "%1 dosyası bulunamadı."
+
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
 msgstr "Yazıtipini Değiştir..."
@@ -1637,6 +1840,10 @@ msgstr "Yeni İşlem..."
 msgid "Select Operation..."
 msgstr "İşlemi Seç..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Metni Değiştir..."
@@ -1686,6 +1893,19 @@ msgstr "Yeni"
 msgid "Rename..."
 msgstr "Yeniden adlandır..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Yapıştırma Hatası"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Çizgi Rengi..."
@@ -1716,14 +1936,26 @@ msgstr "Yapıştırma Hatası"
 msgid "Import Classes..."
 msgstr "Sınıfları Al..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: 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 "Bileşen Diyagramı..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Düğüm"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr ""
@@ -1732,11 +1964,20 @@ msgstr ""
 msgid "Folder"
 msgstr "Dizin"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Bitiş Aktivitesi"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Diyagramlar yükleniyor.."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Aktör"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr "Use Case Diyagramı..."
@@ -1775,6 +2016,19 @@ msgstr "Yeni Öznitelik..."
 msgid "Export as Picture..."
 msgstr "Resim Olarak Kaydet..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Arayüz"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Veri türü"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#, fuzzy
+msgid "Enum"
+msgstr "Yeniden Adlandır"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Sınıf Diyagramı..."
@@ -1796,27 +2050,11 @@ msgstr "Sıralı Diyagram..."
 msgid "Collaboration Diagram..."
 msgstr "Diyagramlar yükleniyor.."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Öznitelikler"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "İşlemler"
-
 #: listpopupmenu.cpp:676
 #, fuzzy
 msgid "Public Only"
 msgstr "Genel"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Görünürlük"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "İşlem İmzası"
@@ -1829,11 +2067,6 @@ msgstr "Öznitelik İmzası"
 msgid "Stereotype"
 msgstr "Stereotip"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Göster"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Öznitelik..."
@@ -1858,14 +2091,6 @@ msgstr "Doldurma Rengi..."
 msgid "Use Fill Color"
 msgstr "Doldurma Rengi Kullan"
 
-#: 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 "Renk"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Aktör..."
@@ -1894,10 +2119,26 @@ msgstr ""
 msgid "Package..."
 msgstr "Paket..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Başlangıç Durumu"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Bitiş Durumu"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Durum..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr ""
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Bitiş Aktivitesi"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -1945,6 +2186,14 @@ msgstr "Çapayı Sil"
 msgid "Change Association Name..."
 msgstr "Bağıntılar Adını Değiştir..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Şekli Temizle"
@@ -1980,8 +2229,8 @@ 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
@@ -1990,192 +2239,95 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2003 Umbrello UML Modelleyici Yazarları"
 
-#: 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
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "%1 dosyası bulunamadı."
-
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "%1 dosyası bulunamadı."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Görkem Çetin"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gorkem@kde.org"
-
-#: 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 "Hazır."
-
-#: 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 ""
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "yeni_aktör"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "yeni_usecase"
 
-#: codeimport/import_utils.cpp:183
-#, fuzzy
-msgid "Namespace"
+#: model_utils.cpp:248
+msgid "new_package"
 msgstr "yeni_paket"
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-#, fuzzy
-msgid "Internal Error"
-msgstr "Yapıştırma Hatası"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "yeni_bileşen"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "yeni_uç"
 
-#: 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:254
+msgid "new_artifact"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "yeni_arayüz"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-#, fuzzy
-msgid "} expected"
-msgstr "Seçili:"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "yeni_veritürü"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
+#: model_utils.cpp:260
+msgid "new_enum"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:688
+#: model_utils.cpp:262
 #, fuzzy
-msgid "{ expected"
-msgstr "Seçili:"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+msgid "new_entity"
+msgstr "yeni_veritürü"
 
-#: codeimport/kdevcppparser/parser.cpp:938
+#: model_utils.cpp:264
 #, fuzzy
-msgid "expected a declaration"
-msgstr "İşlemi Seçin"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+msgid "new_folder"
+msgstr "yeni_uç"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "yeni_bağıntı"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr ""
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "yeni_nesne"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: model_utils.cpp:560
+msgid "Illegal method name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-#, fuzzy
-msgid "Class name expected"
-msgstr "Seçilen Sınıflar"
-
-#: 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
@@ -2190,112 +2342,67 @@ msgstr ""
 msgid "new_parameter"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:36
-#, fuzzy
-msgid "General Options"
-msgstr "Genel ayarlar"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "Paket adı:"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Temel Sınıf Ekle"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Türetilmiş Sınıf Ekle"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "İşlem Ekle"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-#, fuzzy
-msgid "Operations are inline"
-msgstr "Geçersiz İşlem Adı"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Öznitelik Ekle"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Temel Arayüz Ekle"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Türetilmiş Arayüz Ekle"
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
 msgstr ""
 
-#: umlview.cpp:2578
-#, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Şekli Temizle"
-
-#: umlview.cpp:2579
-#, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "Aktivitenin yeni adını yazın:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Türetilmiş Tanımlayıcılar"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
 msgstr ""
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
 msgstr ""
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: statewidget.cpp:176
+msgid "Enter Activity"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
 msgstr ""
 
-#: umllistviewitem.cpp:478
-#, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
 msgstr ""
-"Girilen isim geçersiz!\n"
-"İsim değiştirme işlemi iptal edildi."
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "yeni_bağıntı"
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "yeni_öznitelik"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
 msgstr ""
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "yeni_işlem"
-
-#: umlcanvasobject.cpp:159
-#, fuzzy
-msgid "new_literal"
-msgstr "yeni_arayüz"
-
-#: umlcanvasobject.cpp:162
-#, fuzzy
-msgid "new_field"
-msgstr "yeni_arayüz"
-
 #: uml.cpp:179
 msgid "&Export model to DocBook"
 msgstr ""
@@ -2456,11 +2563,6 @@ msgstr "&Resim Olarak Kaydet..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Resim Olarak Kaydet..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "Ö&zellikler"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr ""
@@ -2548,14 +2650,21 @@ msgstr "&Belgeler"
 msgid "Opening file..."
 msgstr "Dosya açılıyor..."
 
+#: 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 "Yeni belge oluşturuluyor..."
 
 #: 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"
@@ -2583,6 +2692,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2591,6 +2704,10 @@ msgstr ""
 "%1 dosyası mevcut.\n"
 "Bunun üzerine yazmak istiyor musunuz?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2627,8 +2744,8 @@ msgstr "Pano içeriği aktarılıyor..."
 
 #: 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
@@ -2686,1263 +2803,1248 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Sınıf &adı:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Aktör &adı:"
-
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Paket a&dı:"
-
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Use case adı:"
-
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Arayüz adı:"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Bileşen adı:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "yeni_öznitelik"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:64
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "yeni_işlem"
+
+#: umlcanvasobject.cpp:159
 #, fuzzy
-msgid "Enum &name:"
-msgstr "İsim girin:"
+msgid "new_literal"
+msgstr "yeni_arayüz"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Veri tipi adı:"
+#: umlcanvasobject.cpp:162
+#, fuzzy
+msgid "new_field"
+msgstr "yeni_arayüz"
 
-#: dialogs/classgenpage.cpp:68
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "Entity &name:"
-msgstr "İsim girin:"
+msgid "UML Model"
+msgstr "Umbrello UML Modelleyici"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "&Stereotip adı:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Mantıksal Görünüm"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "&Paket adı:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Use Case Görünümü"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr ""
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Bileşen Görünümü"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:109
+msgid "Deployment View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "Ç&alıştırılabilir"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Farklı Çiz"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Veri türleri"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Ö&ntanımlı"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Geçerli dosya değiştirildi.\n"
+"Bunu kaydetmek istiyor musunuz?"
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Kütüphane"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "%1 dosyası bulunamadı."
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tablo"
+#: umldoc.cpp:380
+#, fuzzy
+msgid "The file %1 seems to be corrupted."
+msgstr "%1 dosyası bulunamadı."
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Genel"
+#: 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:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "Ö&zel"
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Programı yüklerken bir hata oluştu: %1"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&Korumalı"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Programı yüklerken bir hata oluştu: %1"
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "&Belgeler"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Sınıf adı:"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "use case diyagramı"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr ""
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "sınıf diyagramı"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Aktör olarak çiz"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "sıra diyagramı"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:284
-#, fuzzy
-msgid "Show destruction"
-msgstr "İşlemleri göster"
-
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Bileşen adı:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "durum diyagramı"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Düğüm adı:"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "etkinlik diyagramı"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Stereotip adı:"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "bileşen diyagramı"
 
-#: 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:948
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Satır:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Doldur:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Bu bir diyagram için geçersiz bir isim."
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "Ö&ntanımlı"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Başka bir diyagram bu ismi kullanıyor."
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+#, fuzzy
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
+"Girilen isim geçersiz!\n"
+"İsim değiştirme işlemi iptal edildi."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Etkinlikler"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Yeni Etkinlik..."
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Use Case"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Yeniden Adlandır"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "İsim girin:"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Yeni Etkinlik"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "%1 diyagramını silmek istediğinize emin misiniz?"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Etkinliği Yeniden Adlandır"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Diyagramı Sil"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Aktivitenin yeni adını yazın:"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Belge düzenleniyor..."
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
 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 "Genel Ayarlar"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "UML öğeleri yükleniyor..."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Roller"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Diyagramlar yükleniyor.."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
 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 "Yazıtipi Ayarları"
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Bağıntı yazıtipi"
-
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Şablon Özellikleri "
-
-#: 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 "Genel Özellikler"
-
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tür:"
-
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "İsi&m:"
-
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Geçersiz bir şablon adı girdiniz."
-
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Geçersiz Şablon Adı"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:416
 #, fuzzy
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Verilen parametre adı bu işlemde zaten kullanılıyor."
+msgid "Enter Model Name"
+msgstr "İsim girin:"
 
-#: dialogs/umltemplatedialog.cpp:139
+#: umllistview.cpp:417
 #, fuzzy
-msgid "Template Name Not Unique"
-msgstr "Parametre Adı Kullanılıyor"
+msgid "Enter the new name of the model:"
+msgstr "Aktivitenin yeni adını yazın:"
 
-#: dialogs/umlentityattributedialog.cpp:43
-#, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Öznitelik Özellikleri"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Görünümler"
 
-#: dialogs/umlentityattributedialog.cpp:73
+#: umllistview.cpp:1906
 #, fuzzy
-msgid "&Default value:"
-msgstr "Ö&ntanımlı"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
+"Girilen isim geçersiz!\n"
+"İsim değiştirme işlemi iptal edildi."
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Geçersiz İsim"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+#, fuzzy
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
+"Girilen isim geçersiz!\n"
+"İsim değiştirme işlemi iptal edildi."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Attributes:"
-msgstr "Öznitelikler"
+msgid "Loading listview..."
+msgstr "Diyagramlar yükleniyor.."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:112
-#, fuzzy
-msgid "&None"
-msgstr "&Yeni"
-
-#: dialogs/umlentityattributedialog.cpp:115
-#, fuzzy
-msgid "&Primary"
-msgstr "&Kütüphane"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Dizin Boş Değil"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-#, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "Geçersiz bir öznitelik adı verdiniz."
-
-#: dialogs/umlentityattributedialog.cpp:185
-#, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "Öznitelik Adı Geçersiz"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistviewitem.cpp:478
 #, fuzzy
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Verilen parametre adı bu işlemde zaten kullanılıyor."
-
-#: dialogs/umlentityattributedialog.cpp:193
-#, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "Öznitelik Adı Geçersiz"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Görünüm"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Sınıf Görünüm Seçenekleri"
-
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Diyagram Renkleri"
-
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Verdiğiniz isim geçerli değildir."
-
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Verdiğiniz isim başka bir isimle çakışıyor."
-
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tür:"
-
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello Kurulumu"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Kullanıcı Arayüzü"
-
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Kullanıcı Arayüzü Ayarları"
-
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Satır rengi:"
-
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Ö&ntanımlı Renk"
-
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Doldurma rengi:"
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Girilen isim geçersiz!\n"
+"İsim değiştirme işlemi iptal edildi."
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Ön&tanımlı Renk"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:73
+#: umlview.cpp:2578
 #, fuzzy
-msgid "Line width:"
-msgstr "Satır:"
+msgid "Enter Diagram Name"
+msgstr "Şekli Temizle"
 
-#: dialogs/settingsdlg.cpp:81
+#: umlview.cpp:2579
 #, fuzzy
-msgid "D&efault Width"
-msgstr "Ö&ntanımlı"
+msgid "Enter the new name of the diagram:"
+msgstr "Aktivitenin yeni adını yazın:"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-#, fuzzy
-msgid "Enable undo"
-msgstr "&Otomatik kaydetmeyi etkinleştir"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "durum diyagramı"
+msgid "Exporting view..."
+msgstr "Çıkılıyor..."
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
-#, fuzzy
-msgid "Use angular association lines"
-msgstr "İşlemi Seçin"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Otomatik kaydet"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Otomatik kaydetmeyi etkinleştir"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Dizin Oluşturulamadı"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Otomatik kaydetme zaman aralığını seç (dakika):"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:148
+#: umlwidgetcontroller.cpp:128
 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>"
+"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:158
-msgid "Startup"
-msgstr "Başlangıç"
+#: 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:164
-msgid "Sta&rtup logo"
-msgstr "&Başlangıç logosu"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Nesne"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Günün ipucu"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Senkron Mesaj"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Son projeyi yükle"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asenkron Mesaj"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Yeni bir projeye başla:"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Etiket"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Diyagram Yok"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Not"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Sınıf Diyagramı"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kutu"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Use Case Diyagramı"
+#: worktoolbar.cpp:257
+#, fuzzy
+msgid "Relationship"
+msgstr "Gerçekleme"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Sıralı Diyagram"
+#: worktoolbar.cpp:258
+#, fuzzy
+msgid "Directional Association"
+msgstr "yeni_bağıntı"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Durum Diyagramı"
-
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Etkinlik Diyagramı"
-
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Bileşen Diyagramı"
-
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Sınıf Ayarları"
-
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Öznitelikleri göster"
-
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "İşlemleri göster"
-
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "&Sterotipleri göster"
-
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Öznitelik imzalarını göster"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Paketi göster"
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Dizin"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "İşlemi Seçin"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
+#: worktoolbar.cpp:285
 #, fuzzy
-msgid "Default operation scope:"
-msgstr "İşlemi Seçin"
-
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Kod Oluşturma"
+msgid "Activity Transition"
+msgstr "Etkinlik geçişi"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Kod Oluşturma Ayarları"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Mesaj"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Kod Görüntüleyici Ayarları"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "İşlem Özellikleri"
+#: worktoolbar.cpp:302
+#, fuzzy
+msgid "Select"
+msgstr "Seçim"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Korumalı"
-
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Belgeler"
-
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametreler"
-
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "&Yeni Parametre..."
-
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Geçersiz bir parametre adı verdiniz."
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Geçersiz Parametre Adı"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "İşlemleri göster"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Parametre Adı Kullanılıyor"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Şekli Temizle"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Verilen parametre adı bu işlemde zaten kullanılıyor."
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Geçersiz bir işlem adı girdiniz."
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Genelleştirme"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Geçersiz İşlem Adı"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
 msgid ""
-"An operation with that signature already exists in %1.\n"
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Farklı bir isim ya da parametre listesi kullanın."
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Bağıntı Adı"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr ""
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "Ö&ntanımlı"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Not Belgesi"
-
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Yeni Öznitelik..."
-
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "&Yeni İşlem..."
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, fuzzy, no-c-format
+msgid "Style:"
+msgstr "Yol Biçemi"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Şablonlar"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "&Yeni Şablon..."
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, fuzzy, no-c-format
+msgid "Method Body Generation"
+msgstr "Kod Oluşturma"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Öznitelikler"
-
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "&Yeni Öznitelik..."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, fuzzy, no-c-format
+msgid "vector"
+msgstr "Aktör"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "İlk etkinlik"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, fuzzy, no-c-format
+msgid "<b>Variable</b>"
+msgstr "Sınıf adı:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Bitiş etkinliği"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, fuzzy, no-c-format
+msgid "..."
+msgstr "Uç..."
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Etkinlik türü:"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, fuzzy, no-c-format
+msgid "QString"
+msgstr "string"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Etkinlik adı:"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Parçacık Renkleri"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Öznitelik Özellikleri"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "İ&lk değer:"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Genel"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Geçersiz bir öznitelik adı verdiniz."
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, fuzzy, no-c-format
+msgid "qstring.h"
+msgstr "string"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Öznitelik Adı Geçersiz"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, fuzzy, no-c-format
+msgid "Class name"
+msgstr "Sınıf adı:"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Öznitelik Adı Geçersiz"
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "İşlemi Seçin"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Project Generation"
+msgstr "Kod Oluşturma"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Sıra numarası:"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Yeni bir dosya oluştururur"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Sınıf işlemi:"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Özel işlem:"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diyagramlar"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, fuzzy, no-c-format
+msgid "Association accessor methods"
+msgstr "Bağıntı Adı"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtre"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, fuzzy, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Öznitelik Özellikleri"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Güncel diyagram"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Tüm diyagramlar"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "İşlemi Seçin"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Diyagramları seç"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "İşlemi Seçin"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "D&iyagram türü"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Seçim"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sıra"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Hiç diyagram seçilmedi."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Dil"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Görünüm Seçenekleri"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Dizinler"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Öznitelik Ayarları"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "İşlem Ayarları"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Gözat..."
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Şablon Ayarları"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "Gö&zat..."
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Öznitelik Ayarları"
-
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "İçerik Ayarları"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Bağıntılar"
+#: 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:222
-msgid "Class Associations"
-msgstr "Sınıf Bağıntıları"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "İş&lemler"
+#: 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/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Görünürlük"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "Ü&zerine yaz"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "İşle&m imzası"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Paket"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Sor"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Özn&itelikler"
+#: 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:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Stereotip"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Farklı bir isim kullan"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Öznitelik imzası"
+#: 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:108
-msgid "Draw as circle"
-msgstr "Çember olarak çiz"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Biçimlendirme"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "İlk durum"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Satır"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Bitiş durumu"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr ""
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Durum türü:"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Girinti türü:"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Durum adı:"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Girinti miktarı:"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Parçacık Rengi"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "yeni_sınıf"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Pencereler"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Yeni Sınıf"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr ""
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Sınıf Öznitelikleri"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Girinti Yok"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Sınıf İşlemleri"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Sekme"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Parametre Özellikleri"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Boşluk"
 
-#: 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 "&Oluştur"
+#: 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:120
-msgid "Finish"
-msgstr "Tamamla"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kod Oluşturuldu"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Oluşturulmadı"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Dil Seçenekleri"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Henüz Oluşturulmadı"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Kod Oluşturma Sihirbazı"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "%1 dizini mevcut değil. Bunun üzerine yazmak istiyor musunuz?"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Sınıfları Seç"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Çıktı Dizini Mevcut Değil"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Dizin Oluşturulamadı"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "&Dosya Oluşturma"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Seçilen Sınıflar"
 
-#: 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."
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Dizin Oluşturulmasında Hata"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Mevcut Sınıflar"
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "Lütfen geçerli bir dizin adı seçiniz."
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Kod Oluşturma Durumu"
 
-#: 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:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Çıktı Dizinine Yazılmasında Hata"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Oluşturma Durumu"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "Lütfen Geçerli Bir Dizin Seçiniz"
-
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Hedef Dosya Mevcut"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+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:78
+#, no-c-format
+msgid "Close"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Kalan tüm dosyalara uygula"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Blok türünü göster"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Ü&zerine yaz"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Renkler"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Benzer Bir Dosya Adı Oluştur"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Yazıtipi:"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Dosya Oluşturma"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Kağıt:"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Seçili:"
+
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
 msgstr ""
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
 msgstr ""
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Bağıntı Adı"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr ""
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Bağıntı adını girin:"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Diyagram Özellikleri"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Rol Adı"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Odakla:"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "Bağıntı adını girin:"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Kılavuzları &göster"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Kılavuza uydur"
+
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
 msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
+#: 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 ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Metni Değiştir"
+#: dialogs/diagrampropertiespage.ui:257
+#, fuzzy, no-c-format
+msgid "Grid spacing:  "
+msgstr "Kılavuz aralığı: X"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
 msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr ""
+#: dialogs/diagrampropertiespage.ui:346
+#, fuzzy, no-c-format
+msgid "Line width:  "
+msgstr "Satır:"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Resim Olarak Kaydet..."
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Durum türü:"
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "dizin"
 
-#: aligntoolbar.cpp:383
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: object_factory.cpp:164
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"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 ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr ""
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Rol Değiştirilebirliği"
 
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Çıkılıyor..."
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Rol Görünürlüğü"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
 msgstr ""
 
-#: umlviewimageexporter.cpp:66
-msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr ""
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diyagram"
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "yeni_aktör"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Yeni"
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "yeni_usecase"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Göster"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "yeni_paket"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Odakla:"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "yeni_bileşen"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kod"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "yeni_uç"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "&Etkin Dil"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: 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:256
-msgid "new_interface"
-msgstr "yeni_arayüz"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "yeni_veritürü"
-
-#: model_utils.cpp:260
-msgid "new_enum"
+#: 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:262
-#, fuzzy
-msgid "new_entity"
-msgstr "yeni_veritürü"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "yeni_uç"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "yeni_nesne"
-
-#: model_utils.cpp:559
-msgid "Empty"
+#: 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"
-msgstr "Temel Sınıf Ekle"
+#: 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"
-msgstr "Türetilmiş Sınıf Ekle"
+#: 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"
-msgstr "İşlem Ekle"
+#: 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"
-msgstr "Öznitelik Ekle"
+#: 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"
-msgstr "Temel Arayüz Ekle"
+#: 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"
-msgstr "Türetilmiş Arayüz Ekle"
+#: 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"
-msgstr "Türetilmiş Tanımlayıcılar"
+#: 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
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Dizin Oluşturulamadı"
+#: 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 "new_stereotype"
diff --git a/tde-i18n-uk/messages/tdesdk/umbrello.po b/tde-i18n-uk/messages/tdesdk/umbrello.po
index 9a93f8c1f74..e7c37e4fd2a 100644
--- a/tde-i18n-uk/messages/tdesdk/umbrello.po
+++ b/tde-i18n-uk/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2007-10-07 20:10-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -13,252 +13,208 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Comment=Файл моделювання UML Umbrello"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Відкрити файл"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "Вживати XSLT файл"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Автори Umbrello UML "
-"Modeller"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Автори Umbrello UML Modeller"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Іван Петрущак"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Експортування всіх виглядів..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "ivanpetrouchtchak@yahoo.com"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "Помилка збереження файла: %1"
+#: 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/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 "Помилка збереження"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Вирівнювати по лівому краю"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Об'єкт"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Вирівняти по правому краю"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Синхронне повідомлення"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Вирівняти по верхньому краю"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Асинхронне повідомлення"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Вирівняти по нижньому краю"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Асоціація"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "Вирівняти вертикально по середині"
 
-#: association.cpp:93 worktoolbar.cpp:249
+#: aligntoolbar.cpp:45
 #, fuzzy
-msgid "Containment"
-msgstr "Розважальна індустрія"
+msgid "Align Horizontal Middle"
+msgstr "Вирівняти горизонтально по середині"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Якір"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "Розподілити по центру (вертикально)"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Надпис"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "Розподілити по центру (горизонтально)"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Примітка"
+#: 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:253
+#: aligntoolbar.cpp:384
 #, fuzzy
-msgid "Box"
-msgstr "Коробка"
+msgid "Information"
+msgstr "Форматування"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Актор"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Залежність"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Узагальнення"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "Агрегація"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Взаємозв'язок"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Пряма асоціація"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Впроваджує (узагальнення/реалізація)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Композиція"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "Клас"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Початковий стан"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Кінцевий стан"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Гілка/об'єднати"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Розділити/з'єднати"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Пакунок"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Залежність"
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Компонент"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Асоціація"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Вузол"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Самоасоціація"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Артифакт"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Повідомлення співпраці"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Інтерфейс"
+#: association.cpp:90
+#, fuzzy
+msgid "Sequence Message"
+msgstr "Частота перевірки &повідомлень:"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Тип даних"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Самоповідомлення співпраці"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Сутність"
-
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Глибока історія"
-
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Мілка історія"
+#: association.cpp:93 worktoolbar.cpp:249
+#, fuzzy
+msgid "Containment"
+msgstr "Розважальна індустрія"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "З'єднати"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Композиція"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Розділити"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Реалізація"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Сполучення"
+#: association.cpp:96
+#, fuzzy
+msgid "Uni Association"
+msgstr "Асоціація з адресною книгою"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Вибір"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Якір"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "Перехід стану"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Перехід діяльності"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Діяльність"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Стан"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Численність"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Кінець діяльності"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Введіть численність:"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Початкова діяльність"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Назва асоціації"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Повідомлення"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Введіть назву асоціації:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "НЕВИЗНАЧЕНО"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Назва ролі"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Вибрати"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Введіть назву ролі:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "Це не чинна назва."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Не чинна назва"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+#, fuzzy
+msgid "That name is already being used."
+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"
+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."
+"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 ""
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -270,18 +226,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Не вдається відкрити файл %1 для запису. Будь ласка, перевірте чи існує тека і "
-"чи ви маєте права в неї записувати."
+"Не вдається відкрити файл %1 для запису. Будь ласка, перевірте чи існує тека "
+"і чи ви маєте права в неї записувати."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Не вдається відкрити файл"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Не вдається створити теку:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Не вдається створити теку:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -295,1299 +249,1529 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Не вдається створити теку"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Введіть назву стану"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Загальні параметри"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Введіть назву нового стану:"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr ""
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Введіть діяльность"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Віртуальні деструктори"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Введіть назву нової діяльності:"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Створювати порожні конструктори"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "нова діяльність"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Створювати методи доступу"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML-модель"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Вбудовані дії"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Логічний вигляд"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Вбудовані методи доступу"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Вигляд випадків вживання"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Публічні методи доступу"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Перегляд компонентів"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Імпортування файла: %1 Поступ: %2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Перегляд впровадження"
+#: 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 "Готово."
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Модель взаємозв'язків сутностей"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr ""
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Типи даних"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Імпорт в C++ потребує вашого втручання"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Поточний файл було змінено.\n"
-"Хочете зберегти?"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Простір назв"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Файл %1 не існує."
+#: 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 "Клас"
 
-#: 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 "Помилка завантаження"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Внутрішня помилка"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Схоже, файл %1 пошкоджено."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Помилка синтаксу перед \"%1\""
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Не знайдено файла XMI в стисненому файлі %1."
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Помилка розбору перед \"%1\""
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Помилка завантаження розпакованого файла: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Помилка завантаження файла: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+#, fuzzy
+msgid "expression expected"
+msgstr "Очікувався булевий вираз"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Трапилась помилка під час вивантаження файла: %1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Помилка синтаксу оголошення"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "Діаграма випадків вживання"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "} очікувалось"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "Діаграмакласів"
+#: codeimport/kdevcppparser/parser.cpp:684
+#, fuzzy
+msgid "namespace expected"
+msgstr "Очікувалась назва класу"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "Діаграма послідовності"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "{ очікувалось"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "Діаграма співпраці"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+#, fuzzy
+msgid "Namespace name expected"
+msgstr "Очікувалась назва класу"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "діаграма станів"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "діаграма діяльності"
+#: codeimport/kdevcppparser/parser.cpp:938
+#, fuzzy
+msgid "expected a declaration"
+msgstr "об'явлення носія"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "діаграма компонентів"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+#, fuzzy
+msgid "Constant expression expected"
+msgstr "Очікувався вираз float"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "діаграма впровадження"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "\")\" очікувалось"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "Діаграма взаємозв'язків сутностей"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "Назва"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "Введіть назву:"
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "Це не чинна назва для діаграми."
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Не чинна назва"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Очікувався ідентифікатор"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Вже існує діаграма з такою назвою."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "Назва не є унікальною"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "Це не чинна назва."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+#, fuzzy
+msgid "condition expected"
+msgstr "Очікувався булевий вираз"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
 #, fuzzy
-msgid "That name is already being used."
-msgstr "Вибрана назва нетипового показу слайдів вже використовується."
+msgid "statement expected"
+msgstr "Об'явлення функції не закінчене"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
+#: codeimport/kdevcppparser/parser.cpp:2705
 #, fuzzy
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr "Введено неунікальну назву."
+msgid "for initialization expected"
+msgstr "Початкові значення для тонування"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Назва не є унікальною"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "очіковувалось catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "Вживати назву"
+#: 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 "&Властивості"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "Введіть нову назву"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Початкова діяльність"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Ви дійсно хочете видалити діаграму %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Кінцева діяльність"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Видалити діаграму"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Гілка/об'єднати"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Побудова документа..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Розділити/з'єднати"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: 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 "Загальне"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Завантаження елементів UML..."
+#: 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 "Загальні властивості"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Завантаження діаграм..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Тип діяльності:"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Назва діяльності:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/автозбереження%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 "Документація"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "Шрифт:"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "Параметри шрифтів"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "Колір"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Перегляд"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Кольори віджетів"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Діяльність"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Не чинна назва"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Нова діяльність..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Видалити якір"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Створення скасовано"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Перейменувати"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Завантаження списку..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Нова діяльність"
 
-#: umllistview.cpp:2670
-#, fuzzy
-msgid "The folder must be emptied before it can be deleted."
-msgstr ""
-"Не вдається спорожнити цю теку тому, що\n"
-"деякі статті з теки зараз використовуються."
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "нова діяльність"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Тека не порожня"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Перейменувати діяльність"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Введіть назву нової діяльності:"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Введіть назву діяльності"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Назва:"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "новий стан"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Тип:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Узагальнення"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Асоціації"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Самоасоціація"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Властивості асоціації"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "Загальні параметри"
 
-#: association.cpp:90
-#, fuzzy
-msgid "Sequence Message"
-msgstr "Частота перевірки &повідомлень:"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Ролі"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Самоповідомлення співпраці"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Параметри ролей"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Шрифт асоціацій"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Реалізація"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Властивості ролі A"
 
-#: association.cpp:96
-#, fuzzy
-msgid "Uni Association"
-msgstr "Асоціація з адресною книгою"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Властивості ролі В"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "&Експортувати"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Видимість ролі A"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Діаграма"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Видимість ролі B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Новий"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Можливість зміни ролі A"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "По&казати"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Можливість зміни ролі B"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "&Код"
+msgid "Rolename:"
+msgstr "Назва ролі:"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "Активна &мова"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "Документація"
+msgid "Public"
+msgstr "Публічний"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "Дві похилі риски (//)"
+msgid "Private"
+msgstr "Приватний"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "Похила риска - зірка (/**  */)"
+msgid "Protected"
+msgstr "Захищений"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "Стиль:"
+msgid "Implementation"
+msgstr "Впровадження"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Створення коду C++</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "Загальне"
+msgid "Frozen"
+msgstr "Заморожене"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr ""
+msgid "Add only"
+msgstr "Тільки додати"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Вживати наступне для класів в створеному коді:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Назва класу:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Назва &актора:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vector"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Назва пакунка:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Змінна</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Назва випадку вживання:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Назва інтерфейсу:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Назва компонента:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "&Назва артифакту:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">String</p>"
+#: dialogs/classgenpage.cpp:64
+#, fuzzy
+msgid "Enum &name:"
+msgstr "Назва &альбому:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">List</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "&Назва типу даних:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "&Назва сутності:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>global?</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Назва &стереотипу:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Назва &пакунка:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Назва класу"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "А&бстрактний клас"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">Включитити файл</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "А&бстракний випадок вживання"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Створення проекту"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Файли програми"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Малювати як"
+
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Типово"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
 #, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Створити файл кешу для документа"
+msgid "&File"
+msgstr "&Заповнення:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Створювати методи автоматично"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Бібліотека"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Порожні методи конструкторів"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Таблиця"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "Методи доступу до асоціацій"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Видимість"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Методи доступу до атрибутів"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+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 "Публічний"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+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 "Приватний"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+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 "Захищений"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Впровад&ження"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "З батьківського об'єкта"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Назва класу:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Методи доступу до атрибутів"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Назва примірника:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Намалювати як актора"
+
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Декілька примірників"
+
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "З батьківської ролі"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Назва компонента:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Створення коду Java</p>"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Назва вузла:"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "Дієз (#)"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Назва стереотипу:"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Початок-кінець (=begin  =end)"
+#: 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 ""
+"Вибрана назва вже\n"
+"використовується.\n"
+"Назву було скинуто."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Створення коду Ruby</p>"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Назва не є унікальною"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Атрибути"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "Н&овий атрибут..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Операції"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "Н&ова операція..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Шаблони"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "Н&овий шаблон..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr ""
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr ""
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Атрибути сутності"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "Н&овий атрибут сутності..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Видалити якір"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Властивості"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Показати"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Ді&ї"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Видимість"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+#, fuzzy
+msgid "O&peration signature"
+msgstr " [Анулюючий підпис]"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Па&кунок"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "Ат&рибути"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Стереот&ип"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Підпис а&трибута"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Малювати як коло"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Показ"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Параметри показу"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Параметри атрибутів"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Параметри операцій"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Параметри шаблонів"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr ""
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Параметри атрибутів сутності"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Розважальна індустрія"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Параметри змісту"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Асоціації класів"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "new_class"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Новий клас"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Атрибути класу"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Операції класу"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Параметри створення коду"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Мова"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Створити"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Теки"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Завершити"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Записати всі створені файли в теку:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Код створено"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "Пере&гляд..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Не створено"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "П&ерегляд..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ще не створено"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Включати файли заголовків з теки:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Тека %1 не існує. Хочете тепер її створити?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Файли створені генератором коду буде записано у цю теку"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Не існує теки виводу"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Створити теку"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Не створювати"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
-"Файли в цій теці будуть вживатись як файли заголовків в створеному коді"
+"Не вдалося створити теку.\n"
+"Будь ласка, перевірте чи ви маєте доступ запису до батьківської теки або "
+"виберіть іншу, чинну, теку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Правила перезапису"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Помилка створення теки"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Будь ласка, виберіть чинну теку."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Якщо вже існує файл з назвою, яку створення коду \n"
-"хоче використовувати як назву файла виводу:"
+"Тека виводу існує, але в неї неможливо записувати.\n"
+"Будь ласка, наставте відповідні права доступу або виберіть іншу теку."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "П&ерезаписувати"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "Перезаписувати існуючі файли"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "\"%1\" не схожий на теку. Будь ласка, виберіть чинний файл."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "Питат&и"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Будь ласка, виберіть чинну теку"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Якщо файл з однаковою назвою існує, запитати що робити"
+msgid "Code Viewer"
+msgstr "Перегляд коду"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Вживати іншу назву"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Немає наявних параметрів.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Діаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Форматування"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Фільтр"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Лінії"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Поточна діаграма"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
-msgstr "Comment=Стиль з використанням альфа-змішування"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Всі діаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Тип відступів:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Виберіть діаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Величина відступу:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Тип діаграми"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Вибір"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"Windows (\"\\r\\n\")"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Випадок вживання"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Співпраця"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Без відступів"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Послідовність"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Табуляція"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Стан"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Пробіл"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Компонент"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Докладність коментарів"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Розгортання"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Не вибрано діаграму."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Формат, у який зображення будуть експортовані"
+
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "Name=Остання документація Qt онлайн"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Файл цілі вже існує"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+"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 ""
+"Файл %1 вже існує %2.\n"
+"\n"
+"Umbrello може перезаписати файл, створити\n"
+"подібну назву файла або не створювати цей файл."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Застосувати до решти файлів"
+
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Перезаписати"
+
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Створити подібну назву файла"
+
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Не створювати файл"
+
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Властивості параметра"
+
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Тип:"
+
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Назва:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Початкове значення:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Напрямок передачі"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
+"\"in\" - це параметр тільки для читання, \"out\" - це параметр тільки для "
+"запису, а \"inout\" - це параметр для читання і запису."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr ""
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr ""
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Виберіть дію"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Параметри мови"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Порядковий номер:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Майстер створення коду"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Дія класу:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Вибрати класи"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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:30
+msgid "Umbrello Setup"
+msgstr "Налаштування Umbrello"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Інтерфейс користувача"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Параметри інтерфейсу користувача"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Колір ліній:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Типовий колір"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Колір заповнення:"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Ти&повий колір"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Товщина ліній:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "&Типова ширина"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "В&живати колір заповнення"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Введіть класи, для яких ви хочете створити код,\n"
-"в список ліворуч"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Додати клас для створення коду"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Увімкнути повернення"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Вибрані класи"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Вживати вкладки"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Вилучити клас зі створення коду"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Вживати нові модулі створення C++/Java/Ruby"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Наявні класи"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Введіть назву асоціації:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Стан створення коду"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Автозбереження"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Натисніть кнопку для запуску створення коду"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Увімкнути автозбереження"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Стан створення"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Виберіть інтервал автозбереження (хв):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Перегляд коду"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Вкажіть суфікс автозбереження:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Показати сховані блоки"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">тут назва компонента</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Запуск"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Показати тип блока"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "&Логотип запуску"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Кольори"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Порада дня"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Шрифт:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Завантажити останній проект"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "Папір:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Починати новий проект з:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Вибрано:"
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Немає діаграми"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Блок об'єкта UML:</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Діаграма класу"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Схований блок:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Діаграма випадку вживання"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Незмінний текст:</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Діаграма послідовностей"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Змінний текст:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Діаграма співпраці"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Властивості діаграми"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Діаграма станів"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Назва:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Масштаб:"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Діаграма компонентів"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Діаграма впровадження"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Параметри класу"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Показати &видимість"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Показати атрибути"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Показати дії"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Показати стереот&ип"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Показати підпис атрибута"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Показати пакунок"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
 msgid "Show operation signature"
 msgstr " [Анулюючий підпис]"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Показати &ґратку"
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr "Триває запуск системи звуку"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Чіплятися до &ґратки"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "Не знайдений компонент календаря."
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "Comment=Типові дії малювання"
 
-#. 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/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Створення коду"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Параметри створення коду"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Параметри перегляду коду"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Початковий стан"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Кінцевий стан"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Тип стану:"
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Назва стану:"
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Колір віджета"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Властивості атрибута"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Інтервал ґратки:  "
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Публічний"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Захи&щений"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "Впровад&ження"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Ширина лінії:  "
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Ви ввели не чинну назву атрибута."
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "Експортувати всі види"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Не чинна назва атрибута"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "&Каталог для збереження діаграм:"
+#: dialogs/umlattributedialog.cpp:163
+msgid ""
+"The attribute name you have chosen is already being used in this operation."
+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"
-msgstr "Базовий каталог для збереження зображень"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Назва атрибута не є унікальною"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "Тип зоб&раження:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+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"
-msgstr "Формат, у який зображення будуть експортовані"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "Типове з&начення:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "Вживати &теки"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Довжина/значення:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, fuzzy, no-c-format
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Авто-інкремент"
+
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Дозволяти &нульове"
+
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Атрибути:"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Індексація"
+
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Нічого"
+
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Основне"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Індекс"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Унікальне"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Ви ввели не чинну назву атрибута сутності."
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Не чинна назва атрибута сутності"
+
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-"Назва групи, видима для користувача. Вона буде показана в структурі дерева як "
-"верхній вузол, якщо в документі <b>немає</b> елементів, які належать до цієї "
-"групи."
+"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
-#, fuzzy, 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 "&Запит (\"const\")"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Параметри"
+
+#: 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 ""
-"<p><b>Фільтр імпортування KMail</b></p>"
-"<p>Виберіть базовий каталог поштової теки KMail, яку ви хочете імпортувати.</p>"
-"<p><b>Примітка:</b> Ніколи не вказуйте вашу поточну поштову теку KMail "
-"(зазвичай, ~/Mail або ~/.trinity/share/apps/kmail/mail ), бо у цьому випадку "
-"KMailCVT може застрягнути в безкінечному циклі. </p>"
-"<p>Цей фільтр не імпортує поштові теки KMail з файлами mbox.</p>"
-"<p>Оскільки, можливо відтворити структуру тек, вона буде міститись в "
-"\"KMail-Import\" у вашій локальній теці.</p>"
+"Вибрана назва параметра вже\n"
+"вживається в цій операції."
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Назва параметра не є унікальною"
+
+#: 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 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Ви ввели не чинну назву операції."
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Не чинна назва операції"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Операція з таким підписом вже існує в %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Виберіть іншу назву або інший список параметрів."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "Властивості ролей"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Назва ролі:"
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Властивості шаблона"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Численність:"
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Ви ввели не чинну назву шаблона."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Можливість зміни ролі"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template 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"
-msgstr "Тільки додати"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Вибрана назва шаблона вже вживається в цій операції."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Заморожене"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Назва шаблона вже використовується"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Можливість зміни"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Параметри показу класів"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Видимість ролі"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Кольори діаграм"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Впровадження"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+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"
-msgstr ""
-"<p>Ласкаво просимо до Umbrello.</p>\n"
-"<p>UML-діаграми допомагають проектувати і документувати об'єктно-орієнтовані "
-"програми.  <a href=\"help:/umbrello\">Підручник з Umbrello</a> "
-"містить короткі відомості про UML.</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Введено неунікальну назву."
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Назва не є унікальною"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Лінія:"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Заповнення:"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Типове"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Вживати заповнення"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+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"
+#: 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:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-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"
+msgstr "Помилка збереження файла: %1"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: 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 "Помилка збереження"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Comment=Файл моделювання UML Umbrello"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Відкрити файл"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "Вживати XSLT файл"
 
-#: 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 ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Автори Umbrello UML "
+"Modeller"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Автори Umbrello UML Modeller"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
+#: 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 "Назва"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
+#: 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 "Введіть назву:"
 
-#: tips.txt:103
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Введіть назву дії:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Введіть новий текст:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "ПОМИЛКА"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Змінити текст"
+
+#: folder.cpp:289
 #, fuzzy
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"Натиснувши цю кнопку ви можете збільшити документ, так щоб було видно всі <b>"
-"вибрані</b> об'єкти."
+msgid "The folderfile %1 does not exist."
+msgstr "<qt>Файл або тека <b>%1</b> не існує."
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
+#: 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 "Помилка завантаження"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Файл %1 не існує або неможливо його відкрити."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1641,6 +1825,10 @@ msgstr "Нова дія..."
 msgid "Select Operation..."
 msgstr "Вибрати дію..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Змінити текст..."
@@ -1694,6 +1882,19 @@ msgstr "Новий"
 msgid "Rename..."
 msgstr "Перейменувати..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Помилка вставлення"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Колір лінії..."
@@ -1722,14 +1923,26 @@ msgstr ""
 msgid "Import Classes..."
 msgstr "Імпортувати класи..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Пакунок"
+
 #: 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 "Вузол"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Діаграма розгортань..."
@@ -1738,10 +1951,18 @@ msgstr "Діаграма розгортань..."
 msgid "Folder"
 msgstr "Тека"
 
+#: 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 "Діаграма випадків вживаня..."
@@ -1778,6 +1999,18 @@ msgstr "Новий атрибут сутності..."
 msgid "Export as Picture..."
 msgstr "Експортувати як зображення..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Інтерфейс"
+
+#: 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 "Діаграма класів..."
@@ -1798,26 +2031,10 @@ msgstr "Діаграма послідовностей..."
 msgid "Collaboration Diagram..."
 msgstr "Діаграма співпраці..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Атрибути"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Операції"
-
 #: 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 "Підпис операції"
@@ -1830,11 +2047,6 @@ msgstr "Підпис атрибута"
 msgid "Stereotype"
 msgstr "Стереотип"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Показати"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Атрибут..."
@@ -1859,14 +2071,6 @@ msgstr "Колір заповнення..."
 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 "Колір"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Актор..."
@@ -1896,10 +2100,26 @@ msgstr "&Редагувати альбом..."
 msgid "Package..."
 msgstr "Пакунок..."
 
+#: 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 "Стан..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Початкова діяльність"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Кінець діяльності"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "Підсистема..."
@@ -1944,6 +2164,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 "Очистити діаграму"
@@ -1981,212 +2209,107 @@ msgstr "Каталог для зберігання файлів штампів"
 #: main.cpp:43
 #, fuzzy
 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 ""
-"Назва групи, видима для користувача. Вона буде показана в структурі дерева як "
-"верхній вузол, якщо в документі <b>немає</b> елементів, які належать до цієї "
-"групи."
+"Назва групи, видима для користувача. Вона буде показана в структурі дерева "
+"як верхній вузол, якщо в документі <b>немає</b> елементів, які належать до "
+"цієї групи."
 
 #: main.cpp:95
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Автори Umbrello UML Modeller"
 
-#: 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
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "<qt>Файл або тека <b>%1</b> не існує."
-
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Файл %1 не існує або неможливо його відкрити."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Іван Петрущак"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "ivanpetrouchtchak@yahoo.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 "Готово."
-
-#: 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 ""
-"Натисніть і тримайте клавішу shift чи ctrl, щоб пересувати по осі X. Натисніть "
-"і тримайте клавішу shift і control, щоб пересувати по осі Y. Клацніть правою "
-"кнопкою мишки, щоб скасувати пересування."
-
-#: 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 ""
-"Натисніть і тримайте клавішу shift чи ctrl, щоб пересувати по осі X. Натисніть "
-"і тримайте клавішу shift і control, щоб пересувати по осі Y. Клацніть правою "
-"кнопкою мишки, щоб скасувати зміну розміру."
-
-#: 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 "Імпорт в C++ потребує вашого втручання"
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "new_actor"
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Простір назв"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "new_usecase"
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Імпортування файла: %1 Поступ: %2/%3"
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "new_package"
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Внутрішня помилка"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "new_component"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Помилка синтаксу перед \"%1\""
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "new_node"
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Помилка розбору перед \"%1\""
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "new_artifact"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "new_interface"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-#, fuzzy
-msgid "expression expected"
-msgstr "Очікувався булевий вираз"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "new_datatype"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Помилка синтаксу оголошення"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "new_enum"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "} очікувалось"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "new_entity"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-#, fuzzy
-msgid "namespace expected"
-msgstr "Очікувалась назва класу"
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "new_folder"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "{ очікувалось"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "new_association"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-#, fuzzy
-msgid "Namespace name expected"
-msgstr "Очікувалась назва класу"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "new_object"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:938
-#, fuzzy
-msgid "expected a declaration"
-msgstr "об'явлення носія"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Порожній"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
+#: model_utils.cpp:559
 #, fuzzy
-msgid "Constant expression expected"
-msgstr "Очікувався вираз float"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "\")\" очікувалось"
-
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "} пропущено"
+msgid "Malformed argument"
+msgstr "Потрібний аргумент \"file\""
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Невідомий тип аргумента"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr ""
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Недозволена назва метода"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr ""
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Невідомий тип повернення значення"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Очікувався ідентифікатор"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Невизначена помилка"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Очікувалась назва класу"
-
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-#, fuzzy
-msgid "condition expected"
-msgstr "Очікувався булевий вираз"
-
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-#, fuzzy
-msgid "statement expected"
-msgstr "Об'явлення функції не закінчене"
-
-#: codeimport/kdevcppparser/parser.cpp:2705
+#: object_factory.cpp:165
 #, fuzzy
-msgid "for initialization expected"
-msgstr "Початкові значення для тонування"
-
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "очіковувалось catch"
+msgid "Reserved Keyword"
+msgstr "\"%1\" - це зарезервоване ключове слово"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2200,104 +2323,67 @@ msgstr "Введіть назву класу:"
 msgid "new_parameter"
 msgstr "new_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Загальні параметри"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Додати базовий клас"
 
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 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"
-msgstr "Діаграма: %2 Сторінка %1"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Додати дію"
 
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Введіть назву діаграми"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Додати атрибут"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Введіть нову назву діаграми:"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Додати базовий інтерфейс"
 
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
-"Ви маєте намір видалити всю діаграму.\n"
-"Ви впевнені?"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Видалити діаграму?"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Перейменування скасовано"
-
-#: umllistviewitem.cpp:468
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
 #, fuzzy
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Тип повернення DCOP %1 ще не впроваджено."
-
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Функція не впроваджена"
+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"
-msgstr "new_association"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Введіть назву стану"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "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"
-msgstr "new_template"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Введіть діяльность"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "new_operation"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Неправильне використання асоціацій."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "new_literal"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Помилка асоціації"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "new_field"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "новий стан"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2451,11 +2537,6 @@ msgstr "&Експортувати як зображення..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Експортувати вс&і діаграми як зображення..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Властивості"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "Пов&зунок масштабування"
@@ -2542,21 +2623,28 @@ msgstr "&Документація"
 msgid "Opening file..."
 msgstr "Відкривається файл..."
 
+#: 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 "Створення нового документа..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Всі файли. які підтримуються (*.xmi, "
-"*.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|Всі файли. які підтримуються (*.xmi, *."
+"xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Нестиснутіі файли XMI (*.xmi)\n"
 "*.xmi.tgz|Gzip-стиснуті файли XMI (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2-стиснуті файли XMI (*.xmi.tar.bz2)\n"
@@ -2586,6 +2674,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2-стиснутий файл XMI\n"
 "*|Всі файли"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2594,6 +2686,10 @@ msgstr ""
 "Файл %1 існує.\n"
 "Хочете його перезаписати?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Перезаписати"
@@ -2629,11 +2725,11 @@ msgstr "Вставлення вмісту кишені..."
 
 #: 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 ""
-"Програма Umbrello не змогла вставити вміст кишені.  Можливо, б'єкти в кишені не "
-"увідповідному форматі, щоб їх тут можна було вставити."
+"Програма Umbrello не змогла вставити вміст кишені.  Можливо, б'єкти в кишені "
+"не увідповідному форматі, щоб їх тут можна було вставити."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2687,1258 +2783,1261 @@ msgstr "Всі файли"
 msgid "Select Code to Import"
 msgstr "Виберіть код для імпорту"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Назва класу:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Назва &актора:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "new_attribute"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Назва пакунка:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "new_template"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Назва випадку вживання:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "new_operation"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Назва інтерфейсу:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "new_literal"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Назва компонента:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "new_field"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "&Назва артифакту:"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML-модель"
 
-#: dialogs/classgenpage.cpp:64
-#, fuzzy
-msgid "Enum &name:"
-msgstr "Назва &альбому:"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Логічний вигляд"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "&Назва типу даних:"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Вигляд випадків вживання"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "&Назва сутності:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Перегляд компонентів"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Назва &стереотипу:"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Перегляд впровадження"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Назва &пакунка:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Модель взаємозв'язків сутностей"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "А&бстрактний клас"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Типи даних"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "А&бстракний випадок вживання"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Поточний файл було змінено.\n"
+"Хочете зберегти?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Файли програми"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Файл %1 не існує."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Малювати як"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Схоже, файл %1 пошкоджено."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Типово"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Не знайдено файла XMI в стисненому файлі %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Бібліотека"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Помилка завантаження розпакованого файла: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Таблиця"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Помилка завантаження файла: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "П&ублічний"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Трапилась помилка під час вивантаження файла: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "П&риватний"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "Діаграма випадків вживання"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Захи&щений"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "Діаграмакласів"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Впровад&ження"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "Діаграма послідовності"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Назва класу:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "Діаграма співпраці"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Назва примірника:"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "діаграма станів"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Намалювати як актора"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "діаграма діяльності"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Декілька примірників"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "діаграма компонентів"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr ""
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "діаграма впровадження"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Назва компонента:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "Діаграма взаємозв'язків сутностей"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Назва вузла:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "Це не чинна назва для діаграми."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "Назва стереотипу:"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Вже існує діаграма з такою назвою."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
+#, fuzzy
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-"Вибрана назва вже\n"
-"використовується.\n"
-"Назву було скинуто."
-
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Назва не є унікальною"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Лінія:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Заповнення:"
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Типове"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Вживати заповнення"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Діяльність"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Нова діяльність..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Перейменувати"
-
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Нова діяльність"
-
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Перейменувати діяльність"
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr "Введено неунікальну назву."
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Введіть назву нової діяльності:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Вживати назву"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Властивості асоціації"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+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 "Загальні параметри"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Ви дійсно хочете видалити діаграму %1?"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Ролі"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Видалити діаграму"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Параметри ролей"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+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 "Параметри шрифтів"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Шрифт асоціацій"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Завантаження елементів UML..."
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Властивості шаблона"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+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 "Загальні властивості"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/автозбереження%1"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Тип:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Назва:"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Введіть назву моделі"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Ви ввели не чинну назву шаблона."
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Введіть нову назву моделі:"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Не чинна назва шаблона"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Перегляд"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistview.cpp:1906
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Вибрана назва шаблона вже вживається в цій операції."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Назва шаблона вже використовується"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Властивості атрибута сутності"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "Типове з&начення:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Довжина/значення:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Авто-інкремент"
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Дозволяти &нульове"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Не чинна назва"
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Атрибути:"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Індексація"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Створення скасовано"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Нічого"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Завантаження списку..."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Основне"
+#: umllistview.cpp:2670
+#, fuzzy
+msgid "The folder must be emptied before it can be deleted."
+msgstr ""
+"Не вдається спорожнити цю теку тому, що\n"
+"деякі статті з теки зараз використовуються."
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Індекс"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Тека не порожня"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Унікальне"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Перейменування скасовано"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Ви ввели не чинну назву атрибута сутності."
+#: umllistviewitem.cpp:468
+#, fuzzy
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Тип повернення DCOP %1 ще не впроваджено."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Не чинна назва атрибута сутності"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Функція не впроваджена"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umllistviewitem.cpp:478
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Вибрана назва атрибутасутності вже вживається в цій операції."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Назва атрибута сутності вже використовується"
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Показ"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Діаграма: %2 Сторінка %1"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Параметри показу класів"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Введіть назву діаграми"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Кольори діаграм"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Введіть нову назву діаграми:"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Ви ввели не чинну назву."
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Ви маєте намір видалити всю діаграму.\n"
+"Ви впевнені?"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Введено неунікальну назву."
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Видалити діаграму?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Тип:"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Експортування перегляду..."
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Налаштування Umbrello"
+#: umlviewimageexporter.cpp:50
+#, fuzzy
+msgid "An error happened when exporting the image:\n"
+msgstr ""
+"При спробі імпортування файла CRL сталася помилка. Вивід з GpgSM:\n"
+"%1"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Інтерфейс користувача"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Вибраний файл %1 існує.\n"
+"Хочете його перезаписати?"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Параметри інтерфейсу користувача"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Файл вже існує"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Колір ліній:"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Не вдається створити каталог: %1"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Типовий колір"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Не можна зберігати порожні діаграми"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Колір заповнення:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Сталася проблема під час збереження діаграми в %1"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Ти&повий колір"
+#: 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 ""
+"Натисніть і тримайте клавішу shift чи ctrl, щоб пересувати по осі X. "
+"Натисніть і тримайте клавішу shift і control, щоб пересувати по осі Y. "
+"Клацніть правою кнопкою мишки, щоб скасувати пересування."
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-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 ""
+"Натисніть і тримайте клавішу shift чи ctrl, щоб пересувати по осі X. "
+"Натисніть і тримайте клавішу shift і control, щоб пересувати по осі Y. "
+"Клацніть правою кнопкою мишки, щоб скасувати зміну розміру."
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "&Типова ширина"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Об'єкт"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "В&живати колір заповнення"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Синхронне повідомлення"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Увімкнути повернення"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Асинхронне повідомлення"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Вживати вкладки"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Надпис"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Вживати нові модулі створення C++/Java/Ruby"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Примітка"
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:253
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "Введіть назву асоціації:"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Автозбереження"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Увімкнути автозбереження"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Виберіть інтервал автозбереження (хв):"
+msgid "Box"
+msgstr "Коробка"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Вкажіть суфікс автозбереження:"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Взаємозв'язок"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
-msgstr ""
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Пряма асоціація"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Запуск"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Впроваджує (узагальнення/реалізація)"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "&Логотип запуску"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Глибока історія"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Порада дня"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Мілка історія"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Завантажити останній проект"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "З'єднати"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Починати новий проект з:"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Розділити"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Немає діаграми"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Сполучення"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Діаграма класу"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Вибір"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Діаграма випадку вживання"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Перехід діяльності"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Діаграма послідовностей"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Повідомлення"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Діаграма співпраці"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "НЕВИЗНАЧЕНО"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Діаграма станів"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Вибрати"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Діаграма компонентів"
-
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Діаграма впровадження"
-
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Параметри класу"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Показати &видимість"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Показати атрибути"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
 msgstr "Показати дії"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Показати стереот&ип"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Показати підпис атрибута"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Очистити діаграму"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Показати пакунок"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
-msgstr "Триває запуск системи звуку"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Узагальнення"
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "Comment=Типові дії малювання"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Створення коду"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Назва асоціації"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Параметри створення коду"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Параметри перегляду коду"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Властивості операцій"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Абстрактна операція"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Типово"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Запит (\"const\")"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Дві похилі риски (//)"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Захи&щений"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Похила риска - зірка (/**  */)"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "Впровад&ження"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Стиль:"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Параметри"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Створення коду C++</p>"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "Нов&ий параметр..."
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Не чинна назва параметра."
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Вживати наступне для класів в створеному коді:"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Не чинна назва параметра"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Вибрана назва параметра вже\n"
-"вживається в цій операції."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vector"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Назва параметра не є унікальною"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Змінна</b>"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Вибрана назва параметра вже вживається в цій операції."
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Ви ввели не чинну назву операції."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Не чинна назва операції"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Операція з таким підписом вже існує в %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">String</p>"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Виберіть іншу назву або інший список параметрів."
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">List</p>"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Властивості ролі A"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Властивості ролі В"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>global?</i>"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Видимість ролі A"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Видимість ролі B"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Назва класу"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Можливість зміни ролі A"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">Включитити файл</p></i>"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Можливість зміни ролі B"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Створення проекту"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Вміщені елементи"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Створити файл кешу для документа"
 
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "Name=Остання документація Qt онлайн"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Створювати методи автоматично"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "Н&овий атрибут..."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Порожні методи конструкторів"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "Н&ова операція..."
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "Методи доступу до асоціацій"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Шаблони"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Методи доступу до атрибутів"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "Н&овий шаблон..."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "З батьківського об'єкта"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr ""
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Методи доступу до атрибутів"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Атрибути сутності"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "З батьківської ролі"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "Н&овий атрибут сутності..."
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Створення коду Java</p>"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Початкова діяльність"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "Дієз (#)"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Кінцева діяльність"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Початок-кінець (=begin  =end)"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Тип діяльності:"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Створення коду Ruby</p>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Назва діяльності:"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Мова"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Кольори віджетів"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Теки"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Властивості атрибута"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Записати всі створені файли в теку:"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Початкове значення:"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "Пере&гляд..."
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Публічний"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "П&ерегляд..."
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Ви ввели не чинну назву атрибута."
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Включати файли заголовків з теки:"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Не чинна назва атрибута"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Файли створені генератором коду буде записано у цю теку"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Вибрана назва атрибута вже вживається в цій операції."
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Файли в цій теці будуть вживатись як файли заголовків в створеному коді"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Назва атрибута не є унікальною"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Правила перезапису"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Виберіть дію"
+#: 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 ""
+"Якщо вже існує файл з назвою, яку створення коду \n"
+"хоче використовувати як назву файла виводу:"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Порядковий номер:"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "П&ерезаписувати"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Дія класу:"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Перезаписувати існуючі файли"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Нетипова дія:"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "Питат&и"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Діаграми"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Якщо файл з однаковою назвою існує, запитати що робити"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Фільтр"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Вживати іншу назву"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Поточна діаграма"
+#: 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/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Всі діаграми"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Форматування"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Виберіть діаграми"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Лінії"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Тип діаграми"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "Comment=Стиль з використанням альфа-змішування"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Вибір"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Тип відступів:"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Співпраця"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Величина відступу:"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Послідовність"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Розгортання"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Не вибрано діаграму."
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Параметри показу"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Без відступів"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Параметри атрибутів"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Табуляція"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Параметри операцій"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Пробіл"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Параметри шаблонів"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Докладність коментарів"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Параметри атрибутів сутності"
-
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Параметри змісту"
-
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Асоціації"
-
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Асоціації класів"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Ді&ї"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Видимість"
-
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr " [Анулюючий підпис]"
-
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Па&кунок"
+#: 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/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "Ат&рибути"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Стереот&ип"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Підпис а&трибута"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Параметри мови"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Малювати як коло"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Майстер створення коду"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Початковий стан"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Вибрати класи"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Кінцевий стан"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"Введіть класи, для яких ви хочете створити код,\n"
+"в список ліворуч"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Тип стану:"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Додати клас для створення коду"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Назва стану:"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Вибрані класи"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Колір віджета"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Вилучити клас зі створення коду"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "new_class"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Наявні класи"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Новий клас"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Стан створення коду"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Атрибути класу"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Натисніть кнопку для запуску створення коду"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Операції класу"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Стан створення"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Властивості параметра"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Показати сховані блоки"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Напрямок передачі"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">тут назва компонента</p>"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
 msgstr ""
-"\"in\" - це параметр тільки для читання, \"out\" - це параметр тільки для "
-"запису, а \"inout\" - це параметр для читання і запису."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Створити"
-
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Завершити"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Код створено"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Показати тип блока"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Не створено"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Кольори"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ще не створено"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Шрифт:"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Тека %1 не існує. Хочете тепер її створити?"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "Папір:"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Не існує теки виводу"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Вибрано:"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Створити теку"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Блок об'єкта UML:</p>"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Не створювати"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Схований блок:</p>"
 
-#: 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 ""
-"Не вдалося створити теку.\n"
-"Будь ласка, перевірте чи ви маєте доступ запису до батьківської теки або "
-"виберіть іншу, чинну, теку."
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Незмінний текст:</p>"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Помилка створення теки"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Змінний текст:</p>"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Будь ласка, виберіть чинну теку."
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+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."
-msgstr ""
-"Тека виводу існує, але в неї неможливо записувати.\n"
-"Будь ласка, наставте відповідні права доступу або виберіть іншу теку."
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Масштаб:"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Помилка запису до теки виводу"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "\"%1\" не схожий на теку. Будь ласка, виберіть чинний файл."
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Показати &ґратку"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Будь ласка, виберіть чинну теку"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Чіплятися до &ґратки"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Файл цілі вже існує"
+#: dialogs/diagrampropertiespage.ui:202
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "Не знайдений компонент календаря."
 
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 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."
+"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 ""
-"Файл %1 вже існує %2.\n"
-"\n"
-"Umbrello може перезаписати файл, створити\n"
-"подібну назву файла або не створювати цей файл."
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Застосувати до решти файлів"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Перезаписати"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Інтервал ґратки:  "
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Створити подібну назву файла"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Не створювати файл"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Немає наявних параметрів.</p>"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Ширина лінії:  "
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Численність"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "Експортувати всі види"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Введіть численність:"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "&Каталог для збереження діаграм:"
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Назва асоціації"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "Базовий каталог для збереження зображень"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Введіть назву асоціації:"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "Тип зоб&раження:"
 
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Назва ролі"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "Вживати &теки"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Введіть назву ролі:"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, fuzzy, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr ""
+"Назва групи, видима для користувача. Вона буде показана в структурі дерева "
+"як верхній вузол, якщо в документі <b>немає</b> елементів, які належать до "
+"цієї групи."
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Введіть назву дії:"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, fuzzy, no-c-format
+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)."
+msgstr ""
+"<p><b>Фільтр імпортування KMail</b></p><p>Виберіть базовий каталог поштової "
+"теки KMail, яку ви хочете імпортувати.</p><p><b>Примітка:</b> Ніколи не "
+"вказуйте вашу поточну поштову теку KMail (зазвичай, ~/Mail або ~/.trinity/"
+"share/apps/kmail/mail ), бо у цьому випадку KMailCVT може застрягнути в "
+"безкінечному циклі. </p><p>Цей фільтр не імпортує поштові теки KMail з "
+"файлами mbox.</p><p>Оскільки, можливо відтворити структуру тек, вона буде "
+"міститись в \"KMail-Import\" у вашій локальній теці.</p>"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Введіть новий текст:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Можливість зміни ролі"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "ПОМИЛКА"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Видимість ролі"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Змінити текст"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "&Експортувати"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Вирівнювати по лівому краю"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Вирівняти по правому краю"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Діаграма"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Вирівняти по верхньому краю"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Новий"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Вирівняти по нижньому краю"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "По&казати"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "Вирівняти вертикально по середині"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Масштаб:"
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "Вирівняти горизонтально по середині"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Код"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "Розподілити по центру (вертикально)"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Активна &мова"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "Розподілити по центру (горизонтально)"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<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 ""
+"<p>Ласкаво просимо до Umbrello.</p>\n"
+"<p>UML-діаграми допомагають проектувати і документувати об'єктно-орієнтовані "
+"програми.  <a href=\"help:/umbrello\">Підручник з Umbrello</a> містить "
+"короткі відомості про UML.</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<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 ""
 
-#: object_factory.cpp:165
-#, fuzzy
-msgid "Reserved Keyword"
-msgstr "\"%1\" - це зарезервоване ключове слово"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Експортування перегляду..."
-
-#: umlviewimageexporter.cpp:50
-#, fuzzy
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"При спробі імпортування файла CRL сталася помилка. Вивід з GpgSM:\n"
-"%1"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"Вибраний файл %1 існує.\n"
-"Хочете його перезаписати?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Файл вже існує"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "new_actor"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "new_usecase"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "new_package"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "new_component"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "new_node"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "new_artifact"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "new_interface"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "new_datatype"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "new_enum"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "new_entity"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "new_folder"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "new_object"
+#: 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:559
-msgid "Empty"
-msgstr "Порожній"
+#: 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:559
-#, fuzzy
-msgid "Malformed argument"
-msgstr "Потрібний аргумент \"file\""
+#: 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:560
-msgid "Unknown argument type"
-msgstr "Невідомий тип аргумента"
+#: 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 ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Недозволена назва метода"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Невідомий тип повернення значення"
+#: 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 ""
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Невизначена помилка"
+#: 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:289
-msgid "Add Base Class"
-msgstr "Додати базовий клас"
+#: 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:290
-msgid "Add Derived Class"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Додати дію"
+#: 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:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Додати атрибут"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Додати базовий інтерфейс"
+#: 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 ""
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
+#: 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 ""
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
+#: tips:121
 #, fuzzy
-msgid "Base Classifiers"
-msgstr "Додати базовий клас"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
 msgstr ""
+"Натиснувши цю кнопку ви можете збільшити документ, так щоб було видно всі "
+"<b>вибрані</b> об'єкти."
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Не вдається створити каталог: %1"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Не можна зберігати порожні діаграми"
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Сталася проблема під час збереження діаграми в %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 ""
diff --git a/tde-i18n-zh_CN/messages/tdesdk/umbrello.po b/tde-i18n-zh_CN/messages/tdesdk/umbrello.po
index dc4d2c17038..af946dc4f4c 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/umbrello.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/umbrello.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2005-12-10 11:21+0800\n"
 "Last-Translator: Levin Du <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -13,246 +13,201 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "UML 建模工具作者"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "要打开的文件"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "UML 建模工具作者"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 简体中文翻译组"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "导出全部视图..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "导出图像时发生了错误："
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "保存文件出错：%1"
+#: 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/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 "保存出错"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "左对齐"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "对象"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "右对齐"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "同步消息"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "上对齐"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "异步消息"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "下对齐"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "关联"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "垂直居中对齐"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "容器"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "水平居中对齐"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "锚点"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "垂直分散对齐"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "标签"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "水平分散对齐"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "注解"
+#: 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:253
-msgid "Box"
-msgstr "方框"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "格式化"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "主角"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "依赖关系"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "泛化"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "聚合"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "关系"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "双向关联"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "实施(泛化/实化)"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "组装"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "类"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "初始状态"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "终止状态"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "分支/合并"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "分叉/连接"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "包"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "组件"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "结点"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "依赖关系"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "工件"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "关联"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "接口"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "自身关联"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "数据类型"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "协作消息"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "枚举"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "序列消息"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "实体"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "协作自身消息"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr ""
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "序列自身消息"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "容器"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "连接"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "组装"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "分叉"
+#: association.cpp:95
+msgid "Realization"
+msgstr "实现"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "联合"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "单向关联"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "选择"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "锚点"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "状态转移"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "活动转移"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "活动"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "状态"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "多重性"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "终止活动"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "输入多重性："
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "初始活动"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "关联名称"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "消息"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "输入关联名称："
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "未定义"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "角色名称"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "选择"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "输入角色名称："
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "名称无效。"
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "无效名称"
+
+#: 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 "名称已被使用。"
+
+#: 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 "名称不唯一"
 
 #: 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."
+"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 "因为有同名项目存在，剪贴板至少有一个项目无法粘贴，其它则粘贴成功。"
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -270,10 +225,8 @@ msgid "Cannot Open File"
 msgstr "无法打开文件"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"无法创建文件夹：\n"
+msgid "Cannot create the folder:\n"
+msgstr "无法创建文件夹：\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -287,1308 +240,1507 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "无法创建文件夹"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "输入状态名称"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "常规选项"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "输入新状态的名称："
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "包是一个名字空间"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "输入活动"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "虚拟析构器"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "输入新活动的名称："
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "生成空构造器"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "新活动"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "生成访问器方法"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML 模型"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "方法为内联"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "逻辑视图"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "访问器为内联"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "用例视图"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "访问器为公开"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "组件视图"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "导入文件：%1 进度：%2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "部署视图"
+#: 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 "就绪。"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "实体关系模型"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "范围 %1 是命名空间还是类？"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "数据类型"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ 导入需要您的帮助"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"当前文件已修改。\n"
-"要保存吗？"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "命名空间"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "文件 %1 不存在。"
+#: 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 "类"
 
-#: 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 "加载出错"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "内部错误"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "文件 %1 似乎已损坏。"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "在“%1”之前发生语法错误"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "压缩文件 %1 中未找到 XMI 文件。"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "在“%1”之前发生分析错误"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "加载提取出的文件出错：%1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<文件结尾>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "加载文件出错：%1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "此处需要表达式"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "上载文件出错：%1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "声明语法错误"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "用例图"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "此处需要 }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "类图"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "此处需要 namespace"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "序列图"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "此处需要 {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "协作图"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "此处需要 namespace 名称"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "状态图"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "声明中需要指定类型"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "活动图"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "此处需要一个声明"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "组件图"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "此处需要常量表达式"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "部署图"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "此处需要‘)’"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "实体关系图"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "名称"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "输入名称："
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "此处需要指定基类"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "图名无效。"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "此处需要初始化语句"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "无效名称"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "此处需要标识符"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "图名已被使用。"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "名称不唯一"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "名称无效。"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "名称已被使用。"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "此处需要语句"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"所输入的名称不唯一。\n"
-"您就要这样吗？"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "此处需要 for 循环初始化"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "名称不唯一"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "此处需要 catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "使用名称"
+#: 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 "属性(&P)"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "输入新名称"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "初始活动"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "确认要删除图 %1 吗？"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "终止活动"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "删除图"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "分支/合并"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "正在建立文档..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "分叉/连接"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "正在解决对象引用..."
+#: 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 "常规"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "正在载入 UML 元素...."
+#: 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 "常规属性"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "正在载入图..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "活动类型："
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "活动名称："
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/自动保存 %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 "文档"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "字体："
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "字体设置"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "颜色"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "视图"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "组件颜色"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"所输入的名称无效。\n"
-"创建进程已被取消。"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "活动"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "名称无效"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "新建活动..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"所输入的名称无效！\n"
-"创建进程已被取消。"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "删除锚点"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "创建已取消"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "重命名"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "正在装入列表视图..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "新建活动"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "文件夹清空后才能删除。"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "新活动"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "文件夹不空"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "重命名活动"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "有同样名称和签名的操作已经存在，不能再次添加。"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "输入活动的新名称："
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "输入活动名称"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "名称："
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "新状态"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "类型："
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "泛化"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "关联"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "自身关联"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "关联属性"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "常规设置"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "序列消息"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "角色"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "协作自身消息"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "角色设置"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "序列自身消息"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "关联字体"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "实现"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "角色 A 属性"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "单向关联"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "角色 B 属性"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "角色 A 可见性"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "图表(&D)"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "角色 B 可见性"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "新建(&N)"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "角色 A 可变性"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "显示(&O)"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "角色 B 可变性"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "代码(&C)"
+msgid "Rolename:"
+msgstr "角色名称："
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "激活语言(&L)"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "文档"
+msgid "Public"
+msgstr "公有"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "双斜杠 (//)"
+msgid "Private"
+msgstr "私有"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "斜杠-星 (/**  */)"
+msgid "Protected"
+msgstr "保护"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "样式："
+msgid "Implementation"
+msgstr "实现"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ 代码生成</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "常规"
+msgid "Frozen"
+msgstr "冻结"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "方法内容生成"
+msgid "Add only"
+msgstr "只添加"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "在类的代码生成中使用以下内容:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "类名(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "主角名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "向量"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "包名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>变量</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "用例名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "接口名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "组件名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "工件名称(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">字符串</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "枚举名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">列表</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "数据类型名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "实体名称(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>全局？</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "构造型名称(&S):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "包名称(&P)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "类名"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "抽象类(&B)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">包含文件</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "抽象用例(&B)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "工程生成"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "可执行(&E)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "创建 ANT 构建文档"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "绘制成"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "自动生成方法"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "默认(&D)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "空构造器方法"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "填充(&F)："
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "关联访问器方法"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "库(&L)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "属性访问器方法"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "表格(&T)"
 
-#. 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 "公有"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+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 "私有"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "公有(&U)"
 
-#. 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 "保护"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "私有(&R)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "从父对象"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "保护(&T)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "默认属性访问器范围："
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "实现(&M)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "默认关联域范围："
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "类名："
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "从父角色"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "实例名称："
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java 代码生成</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "绘制成主角"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "井号(#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "多实例"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Begin-End (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "显示析构器"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby 代码生成</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "组件名称："
+
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "结点名称："
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
+msgstr ""
+"您所选择的名称\n"
+"已经被使用！\n"
+"该名称已重置。"
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "名称不唯一"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "属性"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "新建属性(&E)..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "操作"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "新建操作(&E)..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "模板"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "新建模板(&E)..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "枚举常量"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "新建枚举常量(&E)..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "实体属性"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "新建实体属性(&E)..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "删除锚点"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "属性(&P)"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "显示"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "操作(&N)"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "可见性(&V)"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "操作签名(&P)"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "包(&K)"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "属性(&R)"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "构造型(&Y)"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "属性签名(&I)"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "绘制成圆"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "显示"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "显示选项"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "属性设置"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "操作设置"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "模板设置"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "枚举常量设置"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "实体属性设置"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "容器"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "内容设置"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "类关联"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "新类"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "新类"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "类属性"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "类操作"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "代码生成选项"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "语言"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "生成(&G)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "文件夹"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "完成"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "将全部生成的文件保存到文件夹："
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "代码已生成"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "浏览(&W)..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "未生成"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "浏览(&R)..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "尚未生成"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "包含文件夹中的头文件:"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "文件夹 %1 不存在。要现在创建吗？"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "代码生成器所产生的文件将保存到此文件夹"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "输出文件夹不存在"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "创建文件夹"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "不创建"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
-msgstr "此文件夹中的文件将被用作生成代码的头文件"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
+msgstr ""
+"无法创建文件夹。\n"
+"请确保对其父文件夹有写权限，或者另选一个有效的文件夹。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "覆盖策略"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "创建文件夹出错"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "请选择一个有效的文件夹。"
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"如果生成器所使用的具有相同名称相同代码的\n"
-"输出文件文件已经存在："
+"输出文件夹已存在，但不可写。\n"
+"请设置正确的权限或另选一个文件夹。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "覆盖(&V)"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "如果文件在目标文件夹上存在，则覆盖"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 不像是文件夹。请选择一个有效的文件夹。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "询问(&K)"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "请选择有效的文件夹"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "如果同名文件已经存在，则提示采取的动作"
+msgid "Code Viewer"
+msgstr "代码查看器"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "使用不同的名称(&U)"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">无可用选项。</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "图表(&D)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "格式化"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "过滤器"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "行"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "当前图表(&C)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "行尾风格："
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "全部图表(&A)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "缩进类型:"
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "选择图表(&S)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "缩进量:"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "图表类型(&T)"
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "选中内容"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "用例"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "协作图"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "序列"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "状态"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "组件"
+
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "部署"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "没有选择图表。"
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+msgid "The format that the images will be exported to"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, no-c-format
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "注解文档"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "目标文件已存在"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows (\"\\r\\n\")"
+"文件 %1 已存在于 %2 中。\n"
+"\n"
+"Umbrello 可以覆盖文件、生成名称近似的文件或不生成文件。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "应用到剩下的所有文件(&A)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "无缩进"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "覆盖文件(&O)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "制表符"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "生成名称近似的文件(&G)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "空格"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "不生成文件(&D)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "注释细节"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+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"
-msgstr "即使该部分为空，也要写入注释(&F)"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "类型(&T)："
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "名称(&N)："
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "初值(&I)："
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "传递方向"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
-msgstr "写入注释以指示类中的不同部分(公有、私有等)，即使该部分为空"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
+msgstr "“in”为只读参数，“out”为只写参数，“inout”为可读写参数。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "即使该文档为空，也要写入注释(&W)"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr "即使类和方法的文档为空，也要写入注释"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "选择操作"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "语言选项"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "序列号："
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "代码生成向导"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "类操作："
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "选择类"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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:30
+msgid "Umbrello Setup"
+msgstr "Umbrello 设置"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "用户界面"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "用户界面设置"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "线条颜色："
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "默认颜色(&E)"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "填充颜色："
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "默认颜色(&F)"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "线条宽度："
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "默认宽度(&E)"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "使用填充颜色(&U)"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"将所有需要产生代码的类放置\n"
-"在右边的列表中"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "添加要产生代码的类"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "启用撤消"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "所选的类"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "使用标签式图表"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "删除要产生代码的类"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "使用新的 C++/Java/Ruby 生成器"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "可用的类"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "默认关联域范围："
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "代码生成状态"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "自动保存"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "按下生成按钮开始代码生成"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "启用自动保存(&N)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "生成状态"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "选择自动保存的时间间隔(分)："
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "代码查看器"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "设置自动保存后缀："
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "显示隐藏块"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">组件名称</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "启动"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "显示块类型"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "启动图标(&R)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "颜色"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "每天提示(&T)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "字体："
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "加载上次工程(&L)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "纸张："
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "创建新工程方式："
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "已选中："
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "无图表"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML 对象块：</p>"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "类图"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">隐藏块：</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "用例图"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">只读文本：</p>"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "序列图"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">可编辑文本：</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "协作图"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "图表属性"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "状态图"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "名称："
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "活动图"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "缩放："
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "组件图"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "部署图"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "类设置"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "显示可见性(&V)"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "显示属性"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "显示操作"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "显示构造型(&Y)"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "显示属性签名"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "显示包"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "显示操作签名"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "显示网格(&G)"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "正在开始范围"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "吸附到网格(&T)"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "默认属性范围："
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "吸附组件大小"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "默认操作范围："
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "代码生成"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "代码生成设置"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "代码查看器设置"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "初始状态"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "终止状态"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "状态类型："
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "状态名称："
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "组件颜色"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "属性特性"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "分类空间(“static”)(&S)"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "公有(&P)"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "保护(&E)"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "实现(&M)"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "所属入的属性名称无效。"
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "属性名称无效"
+
+#: dialogs/umlattributedialog.cpp:163
 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 ""
-"吸附组件的大小为网格间距的整数倍。\n"
-"如果启用“吸附到网格”，那么组件的四条边将永远与网格对齐。"
+"The attribute name you have chosen is already being used in this operation."
+msgstr "所选择的属性名称已经在此操作中使用。"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "网格间距："
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "属性名称不唯一"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "实体属性特性"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "默认值(&D)："
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "线宽："
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "长度/值："
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "导出全部视图"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "自动增加(&A)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "保存图表的目录(&D)："
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "允许空(&N)"
 
-#. 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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "属性："
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "图像类型(&I)："
+#: 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"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "无(&N)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "使用文件夹(&F)"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "主键(&P)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "索引(&I)"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "唯一(&U)"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "您所输入的实体属性名称无效。"
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "实体属性名称无效"
+
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+"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 "抽象操作(&A)"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "查询(“const”)(&Q)"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "参数"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "新建参数(&W)..."
+
+#: 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)."
-msgstr ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+msgstr "所选择的参数名称已经在此操作中使用。"
+
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "参数名称不唯一"
+
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "所选择的参数名称已经在此操作中使用。"
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "所输入的操作名称无效。"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "操作名称无效"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "具有同样签名的操作已经存在于 %1。\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "选择不同的名称或参数列表。"
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "角色属性"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "角色名称："
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "模板属性"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "多重性："
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "所输入的模板名称无效。"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "角色可变性"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template 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"
-msgstr "只添加"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "所选择的模板参数名称已经在此操作中使用。"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "冻结"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "模板名称不唯一"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "可变性"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "类显示选项"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "角色可见性"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "图表颜色"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "实现"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+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"
-msgstr ""
-"<p>欢迎使用 Umbrello。</p>\n"
-"<p>UML 图表可帮助您设计面向对象的软件，并为您组织文档。<a href=\"help:/umbrello\">Umbrello 手册</a> "
-"中很好的介绍了 UML 的使用。</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "所输入的名称不唯一。"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>欢迎使用 Umbrello 1.5。此版本中的新增内容包括关联类、Ruby 代码生成、外部化文件夹、将接口转变为类，等等。</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:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>标签式图表和外部化文件夹无法同时使用。如果您需要外部文件夹，必须在常规设置中取消“使用标签式图表”。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "线条(&L)："
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>大多数的图表项目都可以改变大小，以便与内容适应。方框、注解和序列图信息可以改变大小，只需在红色正方形上点击和拖动。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "填充(&F)："
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>如果想添加一个已经存在的类到图表，\n"
-"从树状视图中拖动相应条目即可。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "默认(&E)"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Umbrello 的重构代理使得存在可以在类和它的派生或基类间移动。在类上点击右键可以打开重构代理。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "使用填充(&U)"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>序列图对象可以有一个析构器方框，并绘制成主角。\n"
-"双击可以打开属性对话框。</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "导出全部视图..."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: 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:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-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"
+msgstr "保存文件出错：%1"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: 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 "保存出错"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>剪切和复制会将图象以 PNG 格式保存在剪贴板中，\n"
-"在 KWord 或其它应用程序中可以直接粘贴。</p>\n"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "UML 建模工具作者"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>关联无需一定是直线，双击其中一条，可以创建一个可移动的点。</p>\n"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "要打开的文件"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>在 Umbrello 配置对话框可以打开自动保存功能。</p>\n"
 
-#: tips.txt:76
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>您有 Umbrello 没有提供的功能的需要？请让我们知道。\n"
-"可以使用帮助菜单的错误报告工具增加，\n"
-"或发送到 uml-devel 邮件列表。</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 "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>按删除键或退格键删除全部选中的对象。</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "UML 建模工具作者"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>如果您发现了 Umbrello 的错误，请让我们知道。\n"
-"您可以用帮助菜单里报告错误工具提交。</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 "名称"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>按 ESC 键将所选的工具设定为当前工具。\n"
-"按退格键跳至先前使用的工具。</p>\n"
+#: 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 "输入名称："
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>按 Ctrl-A 选择所有对象。</p>\n"
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "输入操作名称："
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>使用代码菜单中的新建类向导可以创建和设置一个新类。</p>\n"
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "输入新文本："
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "错误"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "更改文本"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "文件夹文件 %1 不存在。"
+
+#: 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 "加载出错"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "文件夹文件 %1 无法打开。"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1642,6 +1794,10 @@ msgstr "新建操作..."
 msgid "Select Operation..."
 msgstr "选择操作..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "更改文本..."
@@ -1693,6 +1849,19 @@ msgstr "新建"
 msgid "Rename..."
 msgstr "重命名..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "粘贴出错"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "线条颜色..."
@@ -1721,14 +1890,26 @@ msgstr "内部化文件夹"
 msgid "Import Classes..."
 msgstr "导入类..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "包"
+
 #: 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 "结点"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "部署图..."
@@ -1737,10 +1918,18 @@ msgstr "部署图..."
 msgid "Folder"
 msgstr "文件夹"
 
+#: 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 "用例图..."
@@ -1777,6 +1966,18 @@ msgstr "新建实体属性..."
 msgid "Export as Picture..."
 msgstr "导出成图片..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "接口"
+
+#: 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 "类图..."
@@ -1797,26 +1998,10 @@ msgstr "序列图..."
 msgid "Collaboration Diagram..."
 msgstr "协作图..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "属性"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "操作"
-
 #: 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 "操作签名"
@@ -1829,11 +2014,6 @@ msgstr "属性签名"
 msgid "Stereotype"
 msgstr "构造型"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "显示"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "属性..."
@@ -1858,14 +2038,6 @@ msgstr "填充颜色..."
 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 "颜色"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "主角..."
@@ -1894,10 +2066,26 @@ msgstr "枚举..."
 msgid "Package..."
 msgstr "包..."
 
+#: 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 "状态..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "初始活动"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "终止活动"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "子系统..."
@@ -1942,6 +2130,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 "清除图表"
@@ -1976,193 +2172,103 @@ 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 "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
 
-#: 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 "文件夹文件 %1 不存在。"
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "文件夹文件 %1 无法打开。"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 简体中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: 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 "就绪。"
-
-#: 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 "范围 %1 是命名空间还是类？"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ 导入需要您的帮助"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "命名空间"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "导入文件：%1 进度：%2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "内部错误"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "在“%1”之前发生语法错误"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "在“%1”之前发生分析错误"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<文件结尾>"
+#: 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"
-msgstr "此处需要表达式"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "新用例"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "声明语法错误"
+#: 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"
-msgstr "此处需要 }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "新组件"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "此处需要 namespace"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "新结点"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "此处需要 {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "新工件"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "此处需要 namespace 名称"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "新接口"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "声明中需要指定类型"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "新数据类型"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "此处需要一个声明"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "新枚举"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "此处需要常量表达式"
+#: 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 "新结点"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "缺少 }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "新关联"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "此处需要成员初始值"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "新对象"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "此处需要指定基类"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "此处需要初始化语句"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "空"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "此处需要标识符"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "参数格式不对"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "此处需要类型标识"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "未知的参数类型"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "此处需要类名"
+#: 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"
-msgstr "此处需要条件"
+#: 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"
-msgstr "此处需要语句"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "未指定的错误"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "此处需要 for 循环初始化"
+#: 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"
-msgstr "此处需要 catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "保留的关键字"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2176,105 +2282,66 @@ msgstr "输入对象名称："
 msgid "new_parameter"
 msgstr "新参数"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "常规选项"
-
-#: 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"
-msgstr "图：%2  页：%1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "输入图表名称"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "添加基类"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "输入图表的新名称："
+#: 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?"
-msgstr ""
-"将要删除整个图表。\n"
-"您确认吗？"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "添加操作"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "删除图表？"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "添加属性"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "重命名被取消"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "添加基接口"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "重命名列表视图类型 %1 尚未实现。"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "添加派生接口"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "功能未实现"
+#: 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."
-msgstr ""
-"所属入的名称无效。\n"
-"重命名过程已被取消。"
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "派生分类器"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "新关联"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "输入状态名称"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "新属性"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "输入新状态的名称："
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "新模板"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "输入活动"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "新操作"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "关联的用法不正确。"
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "新常量"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "关联出错"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "新字段"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "新状态"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2428,11 +2495,6 @@ msgstr "导出为图片(&E)..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "将全部图表导出为图片(&A)..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "属性(&P)"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "缩放滑动条(&Z)"
@@ -2517,21 +2579,28 @@ msgstr "文档(&D)"
 msgid "Opening file..."
 msgstr "正在打开文件..."
 
+#: 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 "正在创建新文档..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|支持的全部文件(*.xmi, *.xmi.tgz, *.xmi.tar.bz2, "
-"*.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|支持的全部文件(*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2, *.mdl)\n"
 "*.xmi|未压缩的 XMI 文件(*.xmi)\n"
 "*.xmi.tgz|Gzip 压缩的 XMI 文件(*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 压缩的 XMI 文件(*.xmi.tar.bz2)\n"
@@ -2561,6 +2630,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 压缩的 XMI 文件\n"
 "*|全部文件"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2569,6 +2642,10 @@ msgstr ""
 "文件 %1 已存在。\n"
 "要覆盖吗？"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "覆盖"
@@ -2604,8 +2681,8 @@ msgstr "正在插入剪贴板内容..."
 
 #: 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 "Umbrello 无法粘贴剪贴板内容。剪贴板中的对象的类型可能不正确。"
 
 #: uml.cpp:863
@@ -2661,1245 +2738,1267 @@ msgstr "全部文件"
 msgid "Select Code to Import"
 msgstr "选择要导入的代码"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "类名(&N)："
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "主角名称(&N)："
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "新属性"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "包名称(&N)："
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "新模板"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "用例名称(&N)："
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "新操作"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "接口名称(&N)："
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "新常量"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "组件名称(&N)："
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "新字段"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "工件名称(&N):"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML 模型"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "枚举名称(&N)："
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "逻辑视图"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "数据类型名称(&N)："
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "用例视图"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "实体名称(&N)："
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "组件视图"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "构造型名称(&S):"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "部署视图"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "包名称(&P)："
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "实体关系模型"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "抽象类(&B)"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "数据类型"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "抽象用例(&B)"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"当前文件已修改。\n"
+"要保存吗？"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "可执行(&E)"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "文件 %1 不存在。"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "绘制成"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "文件 %1 似乎已损坏。"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "默认(&D)"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "压缩文件 %1 中未找到 XMI 文件。"
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "库(&L)"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "加载提取出的文件出错：%1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "表格(&T)"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "加载文件出错：%1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "公有(&U)"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "上载文件出错：%1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "私有(&R)"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "用例图"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "保护(&T)"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "类图"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "实现(&M)"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "序列图"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "类名："
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "协作图"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "实例名称："
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "状态图"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "绘制成主角"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "活动图"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "多实例"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "组件图"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "显示析构器"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "部署图"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "组件名称："
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "实体关系图"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "结点名称："
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "图名无效。"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "构造型名称："
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "图名已被使用。"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"您所选择的名称\n"
-"已经被使用！\n"
-"该名称已重置。"
+"所输入的名称不唯一。\n"
+"您就要这样吗？"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "名称不唯一"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "使用名称"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "线条(&L)："
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "输入新名称"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "填充(&F)："
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "确认要删除图 %1 吗？"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "默认(&E)"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "删除图"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "使用填充(&U)"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "正在建立文档..."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "活动"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "正在解决对象引用..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "新建活动..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "正在载入 UML 元素...."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "重命名"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "正在载入图..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "新建活动"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/自动保存 %1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "重命名活动"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "外部化文件夹"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "输入活动的新名称："
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "输入模型名称"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "关联属性"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+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 "常规设置"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "视图"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "角色"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"所输入的名称无效。\n"
+"创建进程已被取消。"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "角色设置"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+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 "字体设置"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"所输入的名称无效！\n"
+"创建进程已被取消。"
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "关联字体"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "创建已取消"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "模板属性"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+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 "常规属性"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "文件夹清空后才能删除。"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "类型(&T)："
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "文件夹不空"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "名称(&N)："
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "重命名被取消"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "所输入的模板名称无效。"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "重命名列表视图类型 %1 尚未实现。"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "模板名称无效"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "功能未实现"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "所选择的模板参数名称已经在此操作中使用。"
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "模板名称不唯一"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "实体属性特性"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "默认值(&D)："
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "长度/值："
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "自动增加(&A)"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "允许空(&N)"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "属性："
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"所属入的名称无效。\n"
+"重命名过程已被取消。"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "索引"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "图：%2  页：%1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "无(&N)"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "输入图表名称"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "主键(&P)"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "输入图表的新名称："
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "索引(&I)"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"将要删除整个图表。\n"
+"您确认吗？"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "唯一(&U)"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "删除图表？"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "您所输入的实体属性名称无效。"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "正在导出视图..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "实体属性名称无效"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "所选择的实体属性名称已经在此操作中使用。"
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"所选的文件 %1 已存在。\n"
+"您要覆盖吗？"
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "实体属性名称不唯一"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "文件已经存在"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "显示"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "无法创建目录：%1"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "类显示选项"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "无法保存一个空图"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "图表颜色"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "在 %1 中保存图时发生了错误"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "所输入的名称无效。"
+#: 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/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-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 ""
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "类型："
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "对象"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello 设置"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "同步消息"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "用户界面"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "异步消息"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "用户界面设置"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "标签"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "线条颜色："
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "注解"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "默认颜色(&E)"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "方框"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "填充颜色："
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "关系"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "默认颜色(&F)"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "双向关联"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "线条宽度："
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "实施(泛化/实化)"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "默认宽度(&E)"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "使用填充颜色(&U)"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "启用撤消"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "连接"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "使用标签式图表"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "分叉"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "使用新的 C++/Java/Ruby 生成器"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "联合"
 
-#: dialogs/settingsdlg.cpp:120
-#, fuzzy
-msgid "Use angular association lines"
-msgstr "默认关联域范围："
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "选择"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "自动保存"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "活动转移"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "启用自动保存(&N)"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "消息"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "选择自动保存的时间间隔(分)："
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "未定义"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "设置自动保存后缀："
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "选择"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "启动"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "启动图标(&R)"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "每天提示(&T)"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "加载上次工程(&L)"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "创建新工程方式："
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "无图表"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "类图"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "用例图"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "序列图"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "协作图"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "显示操作"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "状态图"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "活动图"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "清除图表"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "组件图"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "部署图"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "泛化"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "类设置"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "显示可见性(&V)"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "显示属性"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "关联名称"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "显示操作"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "显示构造型(&Y)"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "显示属性签名"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "显示包"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "默认(&D)"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "正在开始范围"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "默认属性范围："
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "双斜杠 (//)"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "默认操作范围："
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "斜杠-星 (/**  */)"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "代码生成"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "样式："
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "代码生成设置"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ 代码生成</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "代码查看器设置"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "方法内容生成"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "操作属性"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "在类的代码生成中使用以下内容:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "抽象操作(&A)"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "分类空间(“static”)(&S)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "向量"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "查询(“const”)(&Q)"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>变量</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "保护(&E)"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "实现(&M)"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "参数"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "新建参数(&W)..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">字符串</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "所输入的参数名称无效。"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">列表</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "参数名称无效"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr "所选择的参数名称已经在此操作中使用。"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>全局？</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "参数名称不唯一"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "所选择的参数名称已经在此操作中使用。"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "类名"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "所输入的操作名称无效。"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">包含文件</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "操作名称无效"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "工程生成"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"具有同样签名的操作已经存在于 %1。\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "创建 ANT 构建文档"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "选择不同的名称或参数列表。"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "自动生成方法"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "角色 A 属性"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "空构造器方法"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "角色 B 属性"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "关联访问器方法"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "角色 A 可见性"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "属性访问器方法"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "角色 B 可见性"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "从父对象"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "角色 A 可变性"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "默认属性访问器范围："
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "角色 B 可变性"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "默认关联域范围："
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "包含项目"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "从父角色"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "注解文档"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java 代码生成</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "新建属性(&E)..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "井号(#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "新建操作(&E)..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Begin-End (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "模板"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby 代码生成</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "新建模板(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "语言"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "枚举常量"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "文件夹"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "新建枚举常量(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "将全部生成的文件保存到文件夹："
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "实体属性"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "浏览(&W)..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "新建实体属性(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "浏览(&R)..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "初始活动"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "包含文件夹中的头文件:"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "终止活动"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "代码生成器所产生的文件将保存到此文件夹"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "活动类型："
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr "此文件夹中的文件将被用作生成代码的头文件"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "活动名称："
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "覆盖策略"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "组件颜色"
+#: 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 ""
+"如果生成器所使用的具有相同名称相同代码的\n"
+"输出文件文件已经存在："
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "属性特性"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "覆盖(&V)"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "初值(&I)："
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "如果文件在目标文件夹上存在，则覆盖"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "公有(&P)"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "询问(&K)"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "所属入的属性名称无效。"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "如果同名文件已经存在，则提示采取的动作"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "属性名称无效"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "使用不同的名称(&U)"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "所选择的属性名称已经在此操作中使用。"
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "属性名称不唯一"
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "选择操作"
+"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/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "序列号："
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "格式化"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "类操作："
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "行"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "自定义操作："
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "行尾风格："
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "图表(&D)"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "缩进类型:"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "过滤器"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "缩进量:"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "当前图表(&C)"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "全部图表(&A)"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "选择图表(&S)"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "图表类型(&T)"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "无缩进"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "选中内容"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "制表符"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "协作图"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "空格"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "序列"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "注释细节"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "部署"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "即使该部分为空，也要写入注释(&F)"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "没有选择图表。"
+#: 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/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "显示选项"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "即使该文档为空，也要写入注释(&W)"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "属性设置"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "即使类和方法的文档为空，也要写入注释"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "操作设置"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "语言选项"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "模板设置"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "代码生成向导"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "枚举常量设置"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "选择类"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "实体属性设置"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"将所有需要产生代码的类放置\n"
+"在右边的列表中"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "内容设置"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "添加要产生代码的类"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "关联"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "所选的类"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "类关联"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "删除要产生代码的类"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "操作(&N)"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "可用的类"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "可见性(&V)"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "代码生成状态"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "操作签名(&P)"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "按下生成按钮开始代码生成"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "包(&K)"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "生成状态"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "属性(&R)"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "显示隐藏块"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "构造型(&Y)"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">组件名称</p>"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "属性签名(&I)"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "绘制成圆"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "显示块类型"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "初始状态"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "颜色"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "终止状态"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "字体："
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "状态类型："
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "纸张："
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "状态名称："
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "已选中："
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "组件颜色"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML 对象块：</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "新类"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">隐藏块：</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "新类"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">只读文本：</p>"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "类属性"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">可编辑文本：</p>"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "类操作"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "图表属性"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "参数属性"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "缩放："
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "传递方向"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr "“in”为只读参数，“out”为只写参数，“inout”为可读写参数。"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "显示网格(&G)"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "生成(&G)"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "吸附到网格(&T)"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "完成"
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "吸附组件大小"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "代码已生成"
+#: 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 ""
+"吸附组件的大小为网格间距的整数倍。\n"
+"如果启用“吸附到网格”，那么组件的四条边将永远与网格对齐。"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "未生成"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "网格间距："
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "尚未生成"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "文件夹 %1 不存在。要现在创建吗？"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "输出文件夹不存在"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "线宽："
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "创建文件夹"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "导出全部视图"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "不创建"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "保存图表的目录(&D)："
 
-#: 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."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
-"无法创建文件夹。\n"
-"请确保对其父文件夹有写权限，或者另选一个有效的文件夹。"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "创建文件夹出错"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "图像类型(&I)："
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "请选择一个有效的文件夹。"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "使用文件夹(&F)"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
-"输出文件夹已存在，但不可写。\n"
-"请设置正确的权限或另选一个文件夹。"
-
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "写入输出文件夹时出错"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 不像是文件夹。请选择一个有效的文件夹。"
-
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "请选择有效的文件夹"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "目标文件已存在"
-
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 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."
+"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 ""
-"文件 %1 已存在于 %2 中。\n"
-"\n"
-"Umbrello 可以覆盖文件、生成名称近似的文件或不生成文件。"
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "应用到剩下的所有文件(&A)"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "覆盖文件(&O)"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "生成名称近似的文件(&G)"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "不生成文件(&D)"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">无可用选项。</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "多重性"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "输入多重性："
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "关联名称"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "输入关联名称："
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "角色名称"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "输入角色名称："
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "输入操作名称："
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "输入新文本："
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "角色可变性"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "错误"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "角色可见性"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "更改文本"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "左对齐"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "右对齐"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "图表(&D)"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "上对齐"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "新建(&N)"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "下对齐"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "显示(&O)"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "垂直居中对齐"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "缩放："
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "水平居中对齐"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "代码(&C)"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "垂直分散对齐"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "激活语言(&L)"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "水平分散对齐"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr "要进行对齐，您必须至少选择两个像类或主角这样的对象。您不能对齐关联。"
+"<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 ""
+"<p>欢迎使用 Umbrello。</p>\n"
+"<p>UML 图表可帮助您设计面向对象的软件，并为您组织文档。<a href=\"help:/"
+"umbrello\">Umbrello 手册</a> 中很好的介绍了 UML 的使用。</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "这是配置的代码生成器语言所用的保留关键字。"
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "保留的关键字"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "正在导出视图..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>欢迎使用 Umbrello 1.5。此版本中的新增内容包括关联类、Ruby 代码生成、外部化"
+"文件夹、将接口转变为类，等等。</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you "
+"need External Folders then deselect &quot;Use tabbed diagrams&quot; in the "
+"General Settings.</p>\n"
 msgstr ""
+"<p>标签式图表和外部化文件夹无法同时使用。如果您需要外部文件夹，必须在常规设置"
+"中取消“使用标签式图表”。</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"所选的文件 %1 已存在。\n"
-"您要覆盖吗？"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "文件已经存在"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "新主角"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "新用例"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "新包"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "新组件"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "新结点"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "新工件"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "新接口"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "新数据类型"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "新枚举"
+"<p>大多数的图表项目都可以改变大小，以便与内容适应。方框、注解和序列图信息可以"
+"改变大小，只需在红色正方形上点击和拖动。</p>\n"
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "新实体"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "新结点"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "新对象"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "空"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "参数格式不对"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "未知的参数类型"
+#: 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 ""
+"<p>如果想添加一个已经存在的类到图表，\n"
+"从树状视图中拖动相应条目即可。</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "非法函数名"
+#: 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 ""
+"<p>Umbrello 的重构代理使得存在可以在类和它的派生或基类间移动。在类上点击右键"
+"可以打开重构代理。</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "未知的返回类型"
+#: 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 ""
+"<p>序列图对象可以有一个析构器方框，并绘制成主角。\n"
+"双击可以打开属性对话框。</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "未指定的错误"
+#: 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"
-msgstr "添加基类"
+#: 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"
-msgstr "添加派生类"
+#: 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"
-msgstr "添加操作"
+#: 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 ""
+"<p>剪切和复制会将图象以 PNG 格式保存在剪贴板中，\n"
+"在 KWord 或其它应用程序中可以直接粘贴。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "添加属性"
+#: 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 "<p>关联无需一定是直线，双击其中一条，可以创建一个可移动的点。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "添加基接口"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>在 Umbrello 配置对话框可以打开自动保存功能。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "添加派生接口"
+#: 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 ""
+"<p>您有 Umbrello 没有提供的功能的需要？请让我们知道。\n"
+"可以使用帮助菜单的错误报告工具增加，\n"
+"或发送到 uml-devel 邮件列表。</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a></li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "基分类器"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr "<p>按删除键或退格键删除全部选中的对象。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "派生分类器"
+#: 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 ""
+"<p>如果您发现了 Umbrello 的错误，请让我们知道。\n"
+"您可以用帮助菜单里报告错误工具提交。</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "无法创建目录：%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 ""
+"<p>按 ESC 键将所选的工具设定为当前工具。\n"
+"按退格键跳至先前使用的工具。</p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "无法保存一个空图"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>按 Ctrl-A 选择所有对象。</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "在 %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 "<p>使用代码菜单中的新建类向导可以创建和设置一个新类。</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "新构造型"
diff --git a/tde-i18n-zh_TW/messages/tdesdk/umbrello.po b/tde-i18n-zh_TW/messages/tdesdk/umbrello.po
index 464b3b9e5dc..907a3530eab 100644
--- a/tde-i18n-zh_TW/messages/tdesdk/umbrello.po
+++ b/tde-i18n-zh_TW/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-09-11 13:32+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -15,244 +15,204 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello UML 建模工具自動代碼展生器"
-
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "要轉換的檔案"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "要使用的 XSLT 檔案"
-
-#: docgenerators/main.cpp:64
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML 建模工具作者"
+"原始中文翻譯：TDE 簡體中文翻譯組， 繁體轉換與整理：Frank Weng (a.k.a. "
+"Franklin)"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Umbrello UML 建模工具作者"
-
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "匯出所有的檢視..."
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"i18n-translation@lists.linux.net.cn, franklin at goodhorse dot idv dot tw"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "匯出影像時發生錯誤："
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+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"
-msgstr "儲存檔案時發生錯誤：%1"
+#: 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/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 "儲存時發生錯誤"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "置左對齊"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "物件"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "置右對齊"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "同步訊息"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "置頂對齊"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "非同步訊息"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "置底對齊"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "關聯"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "Align Vertical Middle"
+msgstr "垂直置中對齊"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "包容"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "Align Horizontal Middle"
+msgstr "水平置中對齊"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "錨點"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "Align Vertical Distribute"
+msgstr "垂直分散對齊"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "標籤"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "Align Horizontal Distribute"
+msgstr "水平分散對齊"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "註釋"
+#: 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:253
-msgid "Box"
-msgstr "方框"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "格式化"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "主角"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "相依性"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "一般化"
 
 #: association.cpp:85 worktoolbar.cpp:256
 msgid "Aggregation"
 msgstr "聚合"
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "關係"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "方向性關聯"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "實作（一般化/實作化）"
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "組合"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-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 "類別"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "初始狀態"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "終止狀態"
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "分支/合併"
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "分叉/連接"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "套件"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "元件"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "節點"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "相依性"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "產出"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "關聯"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "介面"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "自身關聯"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "資料型態"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "協作訊息"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Enum"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "序列訊息"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "實體"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "協作自身訊息"
 
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "深歷史"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "序列自身訊息"
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "淺歷史"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "包容"
 
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "連接"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "組合"
 
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "分叉"
+#: association.cpp:95
+msgid "Realization"
+msgstr "實現化"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "接合"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "單向關聯"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "選擇"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "錨點"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr "狀態轉移"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "活動轉移"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "活動"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "狀態"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "多重性"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "終止活動"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "輸入多重性："
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "初始活動"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "關聯名稱"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "訊息"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "輸入關聯名稱："
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "未定義"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "角色名稱"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "選擇"
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "輸入角色名稱："
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
+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."
+msgstr "名稱無效。"
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "無效名稱"
+
+#: 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 "名稱已被使用。"
+
+#: 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 "名稱不唯一"
 
 #: 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."
+"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 "因為有同名項目存在，剪貼簿至少有一個項目無法貼上，其它則貼上成功。"
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
@@ -270,10 +230,8 @@ msgid "Cannot Open File"
 msgstr "無法開啟檔案"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"無法建立資料夾：\n"
+msgid "Cannot create the folder:\n"
+msgstr "無法建立資料夾：\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -287,1305 +245,1508 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "無法建立資料夾"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "輸入狀態名稱"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "一般選項"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "輸入新狀態的名稱："
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Package 是一個命名空間"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "輸入活動"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "虛擬解構子"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "輸入新活動的名稱："
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "產生空的建構子"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "新活動"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "產生存取者方法"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML 模型"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "操作為內含（inline）"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "邏輯檢視"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "存取者為內含（inline）"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "用例檢視"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "存取者為公開"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "元件檢視"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "匯入檔案：%1 進度：%2/%3"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "部署檢視"
+#: 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 "已就緒。"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "實體關係模型"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "範圍 %1 是命名空間還是類別？"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "資料型態"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ 匯入需要您的協助"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"目前的檔案已修改。\n"
-"要儲存嗎？"
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "命名空間"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "檔案 %1 不存在。"
+#: 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 "類別"
 
-#: 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 "載入時發生錯誤"
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "內部錯誤"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "檔案 %1 似乎已損壞。"
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "在“%1”之前發生語法錯誤"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "壓縮檔案 %1 中找不到 XMI 檔。"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "在“%1”之前發生剖析錯誤"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "載入解出來的檔案時發生錯誤：%1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<檔案結尾>"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "載入檔案時發生錯誤：%1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "此處需要表示式"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "上傳檔案時發生錯誤：%1"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "宣告語法錯誤"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "用例圖"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "此處需要 }"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "類別圖"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "此處需要 namespace"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "序列圖"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "此處需要 {"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "協作圖"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "此處需要命名空間的名稱"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "狀態圖"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "宣告中需要指定型態"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "活動圖"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "此處需要一個宣告"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "元件圖"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "此處需要常數表示式"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "部署圖"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "此處需要‘)’"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "實體關係圖"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+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 "名稱"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+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 "輸入名稱："
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "此處需要指定基礎類別"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "圖名無效。"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "此處需要初始化語句"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "無效名稱"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "此處需要識別子"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "圖名已被使用。"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+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"
-msgstr "名稱不唯一"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+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."
-msgstr "名稱無效。"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+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."
-msgstr "名稱已被使用。"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "此處需要敘述"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"所輸入的名稱不唯一。\n"
-"您確定這就是您要的嗎？"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "此處需要 for 循環初始化"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "名稱不唯一"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "此處需要 catch"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Use Name"
-msgstr "使用此名稱"
+#: 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 "屬性(&P)"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-msgid "Enter New Name"
-msgstr "輸入新名稱"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "初始活動"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "確認要刪除圖表 %1 嗎？"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "終止活動"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "刪除圖表"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "分支/合併"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "正在設立文件..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "分叉/連接"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "正在反解物件參考..."
+#: 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 "一般"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "正在載入 UML 元素...."
+#: 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 "一般屬性"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "正在載入圖表..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "活動型態："
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "活動名稱："
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/自動儲存 %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 "文件"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-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
+#, fuzzy
+msgid "Font"
+msgstr "字型："
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-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 "字型設定"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-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 "顏色"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "檢視"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "元件顏色"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"您輸入的名稱無效。\n"
-"建立行程已被取消。"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "活動"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "名稱無效"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "新增活動..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"所輸入的名稱無效！\n"
-"建立行程已被取消。"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "刪除錨點"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "建立已取消"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "重新命名"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "正在載入列表檢視..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "新增活動"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "資料夾清空後才能刪除。"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "新活動"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "資料夾尚未清空"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "重新命名活動"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "有同樣名稱和簽名的操作已經存在，不能再新增。"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "輸入活動的新名稱："
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "輸入活動名稱"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "名稱："
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "新狀態"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "型態："
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "一般化"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "關聯"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "自身關聯"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "關聯屬性"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-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 "一般設定"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "序列訊息"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "角色"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "協作自身訊息"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "角色設定"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "序列自身訊息"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "關聯字型"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "實現化"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "角色 A 屬性"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "單向關聯"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "角色 B 屬性"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr "匯出(&E)"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "角色 A 可見性"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "圖表(&D)"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "角色 B 可見性"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "新增(&N)"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "角色 A 可變性"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "顯示(&O)"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "角色 B 可變性"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&Code"
-msgstr "代碼(&C)"
+msgid "Rolename:"
+msgstr "角色名稱："
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Active &Language"
-msgstr "啟動語言(&L)"
+msgid "Multiplicity:"
+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
+#: 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 "Documentation"
-msgstr "文件"
+msgid "Public"
+msgstr "公開（public）"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: 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 "Slash-Slash (//)"
-msgstr "雙斜線（//）"
+msgid "Private"
+msgstr "私有（private）"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: 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 "Slash-Star (/**  */)"
-msgstr "斜線-星號（/**  */）"
+msgid "Protected"
+msgstr "保護（protected）"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
 #, no-c-format
-msgid "Style:"
-msgstr "樣式："
+msgid "Implementation"
+msgstr "實作"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">C++ 代碼產生</p>"
+msgid "Changeable"
+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
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "General"
-msgstr "一般"
+msgid "Frozen"
+msgstr "凍結"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Method Body Generation"
-msgstr "方法內容產生"
+msgid "Add only"
+msgstr "只新增"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "在產生的代碼中的類別使用以下內容:"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "類別名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "主角名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "向量"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "套件名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>變數</b>"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "用例名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "介面名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "元件名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "string"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "產出名稱(&N):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">字串</p>"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "Enum 名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">列表</p>"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "資料型態名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "實體名稱(&N)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>全域？</i>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "模板造型名稱(&S):"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "套件名稱(&P)："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "類別名稱"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "抽象類別(&B)"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i><p align=\"center\">引入檔案</p></i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "抽象用例(&B)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "專案產生"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "可執行(&E)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
-msgstr "建立 ANT 構建文件"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "繪製成"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "自動產生方法"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "預設(&D)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "空的建構子方法"
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "填充(&F)："
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr "關聯存取者方法"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "函式庫(&L)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr "屬性存取者方法"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "表格(&T)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "公開（public）"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+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 "私有（private）"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "公開（public）(&U)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "保護（protected）"
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "私有（private）(&R)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "從父物件"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "保護（protected）(&T)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "預設屬性存取者範圍："
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "實作(&M)"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
-msgstr "預設關聯欄位範圍："
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "類別名稱："
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "從父角色"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "實體名稱："
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Java 代碼產生</p>"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "繪製成主角"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
-msgstr "井號(#)"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "多重實體"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "Begin-End (=begin  =end)"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "顯示解構"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ruby 代碼產生</p>"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "元件名稱："
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "節點名稱："
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+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."
+msgstr ""
+"您所選擇的名稱已經被使用。\n"
+"該名稱已重置。"
+
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "名稱不唯一"
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "屬性"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "新增屬性(&E)..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "操作"
+
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "新增操作(&E)..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "樣本"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "新增樣本(&E)..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Enum 常數"
+
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "新增 Enum 常數(&E)..."
+
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "實體屬性"
+
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "新增實體屬性(&E)..."
+
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "刪除錨點"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "屬性(&P)"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "顯示"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "操作(&N)"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "可見性(&V)"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "操作簽名(&P)"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "套件(&K)"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "屬性(&R)"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "模板造型(&Y)"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "屬性簽名(&I)"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "繪製成圓"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "顯示"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "顯示選項"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "屬性設定"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "操作設定"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "樣本設定"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Enum 常數設定"
+
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "實體屬性設定"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "包容"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "內容設定"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "類別關聯"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "新類別"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "新類別"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "類別屬性"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "類別操作"
+
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "代碼產生選項"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "語言"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "產生(&G)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "資料夾"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "完成"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "將全部產生的檔案儲存到資料夾："
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "代碼已產生"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "瀏覽(&W)..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "未產生"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "瀏覽(&R)..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "尚未產生"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "引入資料夾中的標頭檔案："
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "資料夾 %1 不存在。要現在建立嗎？"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "代碼產生器所產生的檔案將儲存到此資料夾"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "輸出資料夾不存在"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "建立資料夾"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "不要建立"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
-msgstr "此資料夾中的檔案將被用作產生代碼的標頭檔案"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
+msgstr ""
+"無法建立資料夾。\n"
+"請確定您對其父資料夾有寫入的權限，否則請另選一個可使用的資料夾。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "覆寫策略"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "建立資料夾時發生錯誤"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "請選擇一個有效的資料夾。"
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
-msgstr "如果已經有檔案的名稱跟代碼產生器要用做輸出檔的檔名一樣時："
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
+msgstr ""
+"輸出資料夾已存在，但無法寫入。\n"
+"請設定正確的權限，或另選一個資料夾。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "覆寫(&V)"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+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"
-msgstr "如果檔案存在於目標資料夾內，則覆寫"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 不像是資料夾。請選擇一個有效的資料夾。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "詢問(&K)"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "請選擇有效的資料夾"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "如果同名檔案已經存在，則詢問要怎麼辦"
+msgid "Code Viewer"
+msgstr "代碼檢視"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "使用不同的名稱(&U)"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">沒有可用的選項。</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, 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/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "圖表(&D)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "格式化"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "過濾器"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "行"
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "當前圖表(&C)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "行尾風格："
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "全部圖表(&A)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "縮排型態："
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "選擇圖表(&S)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "縮排大小："
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "圖表型態(&T)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"*NIX（\"\\n\"）"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "選取內容"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "用例"
+
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "協作圖"
+
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "序列"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "狀態"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "元件"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "部署"
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
+
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "沒有選擇圖表。"
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "此影像的格式將匯出到"
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "註釋文件"
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "目標檔案已存在"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"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 ""
-"Windows（\"\\r\\n\"）"
+"檔案 %1 已存在於 %2 中。\n"
+"\n"
+"Umbrello 可以覆蓋檔案、產生名稱相近的檔案或不產生此檔案。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac（\"\\r\"）"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "套用到剩下的所有檔案(&A)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "無縮排"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "覆蓋檔案(&O)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "產生名稱相近的檔案(&G)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "空格"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "不要產生檔案(&D)"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "註解細節"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+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"
-msgstr "即使該部分為空的，也要寫入註解(&F)"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "型態(&T)："
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "名稱(&N)："
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "初始值(&I)："
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "傳遞方向"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
-msgstr "寫入註解以指示類別中的不同部分（公開、私有等），即使該部分為空的"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
+msgstr "\"in\" 為唯讀參數，\"out\" 為唯寫參數，\"inout\" 為可讀寫參數。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "即使該文件為空的，也要寫註解(&W)"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+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"
-msgstr "即使類別和方法的文件為空，也要寫註解"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "選擇操作"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "語言選項"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "序號："
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "代碼產生精靈"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "類別操作："
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "選擇類別"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+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"
-msgstr "將所有需要產生代碼的類別放置在右邊的列表中"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Umbrello 設定"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "加入要產生代碼的類別"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "使用者介面"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "所選的類別"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "使用者介面設定"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "刪除要產生代碼的類別"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "線條顏色："
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "可用的類別"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "預設顏色(&E)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "代碼產生狀態"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "填充顏色："
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "按下產生按鈕開始產生代碼"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "預設顏色(&F)"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "產生狀態"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "線條寬度："
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "代碼檢視"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "預設寬度(&E)"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "顯示隱藏區塊"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "使用填充顏色(&U)"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">元件名稱</p>"
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "顯示區塊型態"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "開啟復原功能"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "顏色"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "使用標籤式圖表"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "字型："
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "使用新的 C++/Java/Ruby 產生器"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
-msgstr "紙張："
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "使用角度關聯線條"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "已選取："
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "自動儲存"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML 物件區塊：</p>"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "開啟自動儲存(&N)"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">隱藏區塊：</p>"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "選擇自動儲存的時間間隔（分）："
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">唯讀文字：</p>"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "設定自動儲存後置字串："
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">可編輯文字：</p>"
+#: dialogs/settingsdlg.cpp:148
+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>"
+msgstr ""
+"<qt> <p>在您手動儲存之前，自動儲存的檔案會儲存到 ~/autosave.xml。</p><p>如果"
+"您已經儲存，則自動儲存的檔案會存在跟原檔案相同的目錄下，用原檔案的檔名，但加"
+"上指定的後置字串。</p> <p>如果指定的後置字串跟您儲存的檔案的後置字串一樣，則"
+"自動儲存會自動覆寫您的檔案。</p></qt>"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "圖表屬性"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "啟動"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "名稱："
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "啟動圖標(&R)"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "縮放："
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "本日小提示(&T)"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "載入上次專案(&L)"
+
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "建立新專案方式："
+
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "無圖表"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "類別圖"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "用例圖"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "序列圖"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "協作圖"
+
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "狀態圖"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "活動圖"
+
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "元件圖"
+
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "部署圖"
+
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "類別設定"
+
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "顯示可見性(&V)"
+
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "顯示屬性"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "顯示操作"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "顯示模板造型(&Y)"
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "顯示屬性簽名"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "顯示套件"
+
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "顯示操作簽名"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "顯示格線(&G)"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "正在開始範圍"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "貼齊格線(&T)"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "預設屬性範圍："
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "貼齊元件大小"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "預設操作範圍："
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "代碼產生"
+
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "代碼產生設定"
+
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "代碼檢視設定"
+
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "初始狀態"
+
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "終止狀態"
+
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "狀態型態："
+
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "狀態名稱："
+
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "元件顏色"
+
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "屬性特性"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "分類別範圍（\"static\"）(&S)"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "公開（public）(&P)"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "保護（protected）(&E)"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "實作(&M)"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "所屬入的屬性名稱無效。"
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "屬性名稱無效"
+
+#: dialogs/umlattributedialog.cpp:163
 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 ""
-"貼齊元件的大小為格線間距的整數倍。\n"
-"如果開啟「貼齊格線」，那麼元件的四條邊將永遠與格線對齊。"
+"The attribute name you have chosen is already being used in this operation."
+msgstr "所選擇的屬性名稱已經在此操作中使用。"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "格線間距："
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "屬性名稱不唯一"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "實體屬性特性"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "預設值(&D)："
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "線寬："
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "長度/值："
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, no-c-format
-msgid "Export all views"
-msgstr "匯出所有檢視"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "自動遞增(&A)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr "儲存圖表的目錄(&D)："
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "允許空(&N)"
 
-#. 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"
-msgstr "用於儲存影像的基礎資料夾"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "屬性："
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, no-c-format
-msgid "&Image type:"
-msgstr "影像型態(&I)："
+#: 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"
-msgstr "此影像的格式將匯出到"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "無(&N)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, no-c-format
-msgid "Use &folders"
-msgstr "使用資料夾(&F)"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "主鍵(&P)"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "索引(&I)"
+
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "唯一(&U)"
+
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "您所輸入的實體屬性名稱無效。"
+
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "實體屬性名稱無效"
+
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr "在目標資料夾建立文件內使用的相同的樹狀結構以儲存檢視。"
+"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 "抽象操作(&A)"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "查詢（\"const\"）(&Q)"
+
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "參數"
+
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "新增參數(&W)..."
+
+#: 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)."
-msgstr ""
-"檢視是保留在文件中的資料夾。您可以將文件中用於儲存檢視的樹狀結構也套用在此選項所選取的基礎資料夾中。\n"
-"只有使用者建立的資料夾會在基礎資料夾中建立（邏輯檢視、用例檢視等不會被建立）。"
+"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
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "參數名稱不唯一"
+
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "所選擇的參數名稱已經在此操作中使用。"
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "所輸入的操作名稱無效。"
+
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "操作名稱無效"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "具有同樣簽名的操作已經存在於 %1。\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "選擇不同的名稱或參數列表。"
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, no-c-format
 msgid "Role Properties"
 msgstr "角色屬性"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "角色名稱："
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "樣本屬性"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "多重性："
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "所輸入的樣本名稱無效。"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "角色可變性"
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template 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"
-msgstr "只新增"
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "所選擇的樣本參數名稱已經在此操作中使用。"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "凍結"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "樣本名稱不唯一"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "可變性"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "類別顯示選項"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "角色可見性"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "圖表顏色"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "實作"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+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"
-msgstr ""
-"<p>歡迎使用 Umbrello。</p>\n"
-"<p>UML 圖表可幫助您設計物件導向軟體，並為您組織文件。<a href=\"help:/umbrello\">Umbrello 手冊</a> "
-"中對 UML 的使用有很好的介紹。</p>\n"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "所輸入的名稱不唯一。"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>歡迎使用 Umbrello 1.5。此版本中的新增內容包括關聯類別、Ruby 代碼產生、外部化資料夾、將介面轉變為類別等等。</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:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>標籤式圖表和外部化資料夾無法同時使用。如果您需要外部資料夾，必須在一般設定中取消「使用標籤式圖表」。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "線條(&L)："
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>大多數的圖表項目都不能手動改變大小，它們會自己改變以便適用於它們的內容。方框、註釋和序列圖信息可以改變大小，只需在紅色正方形上點擊和拖曳。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "填充(&F)："
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>如果想新增一個已經存在的類別到圖表，從樹狀檢視中拖曳即可。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "預設(&E)"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Umbrello 的重構代理讓您可以在類別和它的衍生或基礎類別間移動操作。在類別上點擊右鍵可以開啟重構代理。</p>\n"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "使用填充(&U)"
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>序列圖物件可以有一個解構子方框，並繪製成主角。雙擊可以開啟屬性對話框。</p>\n"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "匯出所有的檢視..."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>序列圖訊息可以做為建構子。點擊物件方框（而不是垂直線）就可以讓它做為建構子。</p>\n"
+#: 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:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>序列圖支援給自己的訊息。再次點選同樣的垂直線條就可以建立一個自動訊息。</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 "儲存檔案時發生錯誤：%1"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>如果載入外部檔案時在列表檢視中沒有顯示任何東西，請試著用不同名稱儲存模型，關閉再重新載入剛儲存的檔案。通常列表檢視就會正常了。</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 "儲存時發生錯誤"
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>剪下和複製會將影像以 PNG 格式儲存在剪貼簿中，在 KWord 或其它應用程式中可以直接貼上。</p>\n"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello UML 建模工具自動代碼展生器"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>關聯不必一定是直線。雙擊其中一條，可以建立一個可移動的點。</p>\n"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "要轉換的檔案"
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>在 Umbrello 設定對話框中可以開啟自動儲存功能。</p>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "要使用的 XSLT 檔案"
 
-#: 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 ""
-"<p>您需要 Umbrello 沒有提供的功能？請讓我們知道。\n"
-"可以使用說明選單的中的「報告問題」來增加希望清單，\n"
-"或發信到 uml-devel 郵件論壇。</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 建模工具作"
+"者"
 
-#: tips.txt:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>按刪除鍵或後退鍵來刪除全部選中的物件。</p>\n"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Umbrello UML 建模工具作者"
 
-#: tips.txt:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>如果您發現了 Umbrello 的錯誤，請讓我們知道。\n"
-"您可以用說明選單裡的「報告問題」來回報。</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 "名稱"
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>按 ESC 鍵將所選的工具設定為目前使用的工具。按後退鍵跳至先前使用的工具。</p>\n"
+#: 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 "輸入名稱："
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>按 Ctrl-A 選擇所有物件。</p>\n"
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "輸入操作名稱："
 
-#: tips.txt:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>使用代碼選單中的新增類別精靈可以建立和設定一個新類別。</p>\n"
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "輸入新文字："
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "錯誤"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "更改文字"
+
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "資料夾檔案 %1 不存在。"
+
+#: 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 "載入時發生錯誤"
+
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "資料夾檔案 %1 無法開啟。"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1639,6 +1800,10 @@ msgstr "新增操作..."
 msgid "Select Operation..."
 msgstr "選擇操作..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "更改文字..."
@@ -1690,6 +1855,19 @@ msgstr "新增"
 msgid "Rename..."
 msgstr "重新命名..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "貼上時發生錯誤"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "線條顏色..."
@@ -1718,14 +1896,26 @@ msgstr "內部化資料夾"
 msgid "Import Classes..."
 msgstr "匯入類別..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "套件"
+
 #: 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 "節點"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "部署圖..."
@@ -1734,10 +1924,18 @@ msgstr "部署圖..."
 msgid "Folder"
 msgstr "資料夾"
 
+#: 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 "用例圖..."
@@ -1774,6 +1972,18 @@ msgstr "新增實體屬性..."
 msgid "Export as Picture..."
 msgstr "匯出成圖片..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "介面"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "資料型態"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Enum"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "類別圖..."
@@ -1794,26 +2004,10 @@ msgstr "序列圖..."
 msgid "Collaboration Diagram..."
 msgstr "協作圖..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "屬性"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "操作"
-
 #: 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 "操作簽名"
@@ -1826,11 +2020,6 @@ msgstr "屬性簽名"
 msgid "Stereotype"
 msgstr "模板造型"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "顯示"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "屬性..."
@@ -1855,14 +2044,6 @@ msgstr "填充顏色..."
 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 "顏色"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "主角..."
@@ -1891,10 +2072,26 @@ msgstr "Enum..."
 msgid "Package..."
 msgstr "套件..."
 
+#: 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 "狀態..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "初始活動"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "終止活動"
+
 #: listpopupmenu.cpp:1053
 msgid "Subsystem..."
 msgstr "子系統..."
@@ -1939,6 +2136,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 "清除圖表"
@@ -1973,194 +2178,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 "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
 
-#: 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 "資料夾檔案 %1 不存在。"
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "資料夾檔案 %1 無法開啟。"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "原始中文翻譯：TDE 簡體中文翻譯組， 繁體轉換與整理：Frank Weng (a.k.a. Franklin)"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"i18n-translation@lists.linux.net.cn, franklin at goodhorse dot idv dot tw"
-
-#: 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 "已就緒。"
-
-#: 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 "按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取消移動。"
-
-#: 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 "按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取消調整大小。"
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "範圍 %1 是命名空間還是類別？"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ 匯入需要您的協助"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "命名空間"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "匯入檔案：%1 進度：%2/%3"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "內部錯誤"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "在“%1”之前發生語法錯誤"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "在“%1”之前發生剖析錯誤"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<檔案結尾>"
+#: 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"
-msgstr "此處需要表示式"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "新用例"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "宣告語法錯誤"
+#: 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"
-msgstr "此處需要 }"
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "新元件"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "此處需要 namespace"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "新節點"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "此處需要 {"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "新產出"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "此處需要命名空間的名稱"
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "新介面"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "宣告中需要指定型態"
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "新資料型態"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "此處需要一個宣告"
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "新 Enum"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "此處需要常數表示式"
+#: 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
+msgid "new_folder"
+msgstr "新資料夾"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "缺少 }"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "新關聯"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "此處需要成員初始值"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "新物件"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "此處需要指定基礎類別"
+#: model_utils.cpp:559
+msgid "OK"
+msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "此處需要初始化語句"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "空"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "此處需要識別子"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "參數格式不對"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "此處需要型態標識"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "未知的參數型態"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "此處需要類別名稱"
+#: 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"
-msgstr "此處需要條件"
+#: 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"
-msgstr "此處需要敘述"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "未指定的錯誤"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "此處需要 for 循環初始化"
+#: 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"
-msgstr "此處需要 catch"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "保留的關鍵字"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2174,105 +2287,66 @@ msgstr "輸入物件名稱："
 msgid "new_parameter"
 msgstr "新參數"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "一般選項"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Package 是一個命名空間"
-
-#: 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 "操作為內含（inline）"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "存取者為內含（inline）"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "存取者為公開"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "圖表：%2  頁：%1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "輸入圖表名稱"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "新增基礎類別"
 
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "輸入圖表的新名稱："
+#: 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?"
-msgstr ""
-"將要刪除整個圖表。\n"
-"您確定嗎？"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "新增操作"
 
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "刪除圖表？"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "新增屬性"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "重新命名已取消"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "新增基礎介面"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "重新命名列表檢視型態 %1 的項目的功能尚未實作。"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "新增衍生介面"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "功能未實作"
+#: 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."
-msgstr ""
-"您輸入的名稱無效。\n"
-"重新命名行程已被取消。"
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "衍生分類器"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "新關聯"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "輸入狀態名稱"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "新屬性"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "輸入新狀態的名稱："
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "新樣本"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "輸入活動"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "新操作"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "關聯的用法不正確。"
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "新常數"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "關聯錯誤"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "新欄位"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "新狀態"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2426,11 +2500,6 @@ msgstr "匯出為圖片(&E)..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "將全部圖表匯出為圖片(&A)..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "屬性(&P)"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "縮放滑動器(&Z)"
@@ -2515,21 +2584,28 @@ msgstr "文件(&D)"
 msgid "Opening file..."
 msgstr "正在開啟檔案..."
 
+#: 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 "正在建立新文件..."
 
 #: 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"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|所有支援的檔案（*.xmi, *.xmi.tgz, *.xmi.tar.bz2, "
-"*.mdl）\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|所有支援的檔案（*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2, *.mdl）\n"
 "*.xmi|未壓縮的 XMI 檔案（*.xmi）\n"
 "*.xmi.tgz|Gzip 壓縮的 XMI 檔案（*.xmi.tgz）\n"
 "*.xmi.tar.bz2|Bzip2 壓縮的 XMI 檔案（*.xmi.tar.bz2）\n"
@@ -2559,6 +2635,10 @@ msgstr ""
 "*.xmi.tar.bz2|Bzip2 壓縮的 XMI 檔案\n"
 "*|全部檔案"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2567,6 +2647,10 @@ msgstr ""
 "檔案 %1 已存在。\n"
 "要覆寫它嗎？"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "覆寫"
@@ -2602,8 +2686,8 @@ msgstr "正在插入剪貼簿內容..."
 
 #: 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 "Umbrello 無法貼上剪貼簿內容。剪貼簿中的物件的型態可能不正確。"
 
 #: uml.cpp:863
@@ -2658,1247 +2742,1275 @@ msgstr "全部檔案"
 msgid "Select Code to Import"
 msgstr "選擇要匯入的代碼"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "類別名稱(&N)："
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "主角名稱(&N)："
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "新屬性"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "套件名稱(&N)："
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "新樣本"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "用例名稱(&N)："
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "新操作"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "介面名稱(&N)："
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "新常數"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "元件名稱(&N)："
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "新欄位"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "產出名稱(&N):"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML 模型"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "Enum 名稱(&N)："
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "邏輯檢視"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "資料型態名稱(&N)："
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "用例檢視"
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "實體名稱(&N)："
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "元件檢視"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "模板造型名稱(&S):"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "部署檢視"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "套件名稱(&P)："
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "實體關係模型"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "抽象類別(&B)"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "資料型態"
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "抽象用例(&B)"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"目前的檔案已修改。\n"
+"要儲存嗎？"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "可執行(&E)"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "檔案 %1 不存在。"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "繪製成"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "檔案 %1 似乎已損壞。"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "預設(&D)"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "壓縮檔案 %1 中找不到 XMI 檔。"
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "函式庫(&L)"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "載入解出來的檔案時發生錯誤：%1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "表格(&T)"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "載入檔案時發生錯誤：%1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "公開（public）(&U)"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "上傳檔案時發生錯誤：%1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "私有（private）(&R)"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "用例圖"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "保護（protected）(&T)"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "類別圖"
 
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "實作(&M)"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "序列圖"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "類別名稱："
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "協作圖"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "實體名稱："
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "狀態圖"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "繪製成主角"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "活動圖"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "多重實體"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "元件圖"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "顯示解構"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "部署圖"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "元件名稱："
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "實體關係圖"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "節點名稱："
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "圖名無效。"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr "模板造型名稱："
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "圖名已被使用。"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"您所選擇的名稱已經被使用。\n"
-"該名稱已重置。"
+"所輸入的名稱不唯一。\n"
+"您確定這就是您要的嗎？"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "名稱不唯一"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "使用此名稱"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "線條(&L)："
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "輸入新名稱"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "填充(&F)："
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "確認要刪除圖表 %1 嗎？"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "預設(&E)"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "刪除圖表"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "使用填充(&U)"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "正在設立文件..."
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "活動"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "正在反解物件參考..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "新增活動..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "正在載入 UML 元素...."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "重新命名"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "正在載入圖表..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "新增活動"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/自動儲存 %1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "重新命名活動"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "外部化資料夾"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "輸入活動的新名稱："
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "輸入模型名稱"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "關聯屬性"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+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 "一般設定"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "檢視"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "角色"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"您輸入的名稱無效。\n"
+"建立行程已被取消。"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "角色設定"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+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 "字型設定"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"所輸入的名稱無效！\n"
+"建立行程已被取消。"
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "關聯字型"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "建立已取消"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "樣本屬性"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+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 "一般屬性"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "資料夾清空後才能刪除。"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "型態(&T)："
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "資料夾尚未清空"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "名稱(&N)："
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "重新命名已取消"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "所輸入的樣本名稱無效。"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "重新命名列表檢視型態 %1 的項目的功能尚未實作。"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "樣本名稱無效"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "功能未實作"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "所選擇的樣本參數名稱已經在此操作中使用。"
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "樣本名稱不唯一"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "實體屬性特性"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "預設值(&D)："
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "長度/值："
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "自動遞增(&A)"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "允許空(&N)"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "屬性："
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"您輸入的名稱無效。\n"
+"重新命名行程已被取消。"
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "索引"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "圖表：%2  頁：%1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "無(&N)"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "輸入圖表名稱"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "主鍵(&P)"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "輸入圖表的新名稱："
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "索引(&I)"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"將要刪除整個圖表。\n"
+"您確定嗎？"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "唯一(&U)"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "刪除圖表？"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "您所輸入的實體屬性名稱無效。"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "正在匯出檢視..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "實體屬性名稱無效"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr "匯出影像時發生錯誤。\n"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "所選擇的實體屬性名稱已經在此操作中使用。"
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"所選取的檔案 %1 已存在。\n"
+"您要覆寫它嗎？"
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "實體屬性名稱不唯一"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "檔案已存在"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "顯示"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "無法建立目錄：%1"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "類別顯示選項"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "無法儲存一個空的圖表"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "圖表顏色"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "在 %1 中儲存圖表時發生了錯誤"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "所輸入的名稱無效。"
+#: 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 ""
+"按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取"
+"消移動。"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-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 ""
+"按住 shift 或 ctrl 來移動 X 軸。按住 shift 與 control 來移動 Y 軸。點選右鍵取"
+"消調整大小。"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "型態："
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "物件"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Umbrello 設定"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "同步訊息"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "使用者介面"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "非同步訊息"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "使用者介面設定"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "標籤"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "線條顏色："
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "註釋"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "預設顏色(&E)"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "方框"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "填充顏色："
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "關係"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "預設顏色(&F)"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "方向性關聯"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "線條寬度："
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "實作（一般化/實作化）"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "預設寬度(&E)"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "深歷史"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "使用填充顏色(&U)"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "淺歷史"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "開啟復原功能"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "連接"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "使用標籤式圖表"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "分叉"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "使用新的 C++/Java/Ruby 產生器"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "接合"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "使用角度關聯線條"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "選擇"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "自動儲存"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "活動轉移"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "開啟自動儲存(&N)"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "訊息"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "選擇自動儲存的時間間隔（分）："
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "未定義"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "設定自動儲存後置字串："
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "選擇"
 
-#: dialogs/settingsdlg.cpp:148
-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>"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
 msgstr ""
-"<qt> "
-"<p>在您手動儲存之前，自動儲存的檔案會儲存到 ~/autosave.xml。</p>"
-"<p>如果您已經儲存，則自動儲存的檔案會存在跟原檔案相同的目錄下，用原檔案的檔名，但加上指定的後置字串。</p> "
-"<p>如果指定的後置字串跟您儲存的檔案的後置字串一樣，則自動儲存會自動覆寫您的檔案。</p></qt>"
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "啟動"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "啟動圖標(&R)"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "本日小提示(&T)"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "載入上次專案(&L)"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "建立新專案方式："
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "無圖表"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "類別圖"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "用例圖"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "序列圖"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "協作圖"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "顯示操作"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "狀態圖"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "活動圖"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "清除圖表"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "元件圖"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "部署圖"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "一般化"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "類別設定"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "顯示可見性(&V)"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "顯示屬性"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "關聯名稱"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "顯示操作"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "顯示模板造型(&Y)"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "顯示屬性簽名"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "顯示套件"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "預設(&D)"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "正在開始範圍"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "預設屬性範圍："
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "雙斜線（//）"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "預設操作範圍："
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "斜線-星號（/**  */）"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "代碼產生"
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "樣式："
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "代碼產生設定"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">C++ 代碼產生</p>"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "代碼檢視設定"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "方法內容產生"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "操作屬性"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "在產生的代碼中的類別使用以下內容:"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "抽象操作(&A)"
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "分類別範圍（\"static\"）(&S)"
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "向量"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "查詢（\"const\"）(&Q)"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>變數</b>"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "保護（protected）(&E)"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "實作(&M)"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "參數"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "string"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "新增參數(&W)..."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">字串</p>"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "所輸入的參數名稱無效。"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">列表</p>"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "參數名稱無效"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr "所選擇的參數名稱已經在此操作中使用。"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>全域？</i>"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "參數名稱不唯一"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "所選擇的參數名稱已經在此操作中使用。"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "類別名稱"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "所輸入的操作名稱無效。"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i><p align=\"center\">引入檔案</p></i>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "操作名稱無效"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "專案產生"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"具有同樣簽名的操作已經存在於 %1。\n"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr "建立 ANT 構建文件"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "選擇不同的名稱或參數列表。"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "自動產生方法"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "角色 A 屬性"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "空的建構子方法"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "角色 B 屬性"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
+msgstr "關聯存取者方法"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "角色 A 可見性"
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr "屬性存取者方法"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "角色 B 可見性"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "從父物件"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "角色 A 可變性"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "預設屬性存取者範圍："
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "角色 B 可變性"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr "預設關聯欄位範圍："
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "包含項目"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "從父角色"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "註釋文件"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Java 代碼產生</p>"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "新增屬性(&E)..."
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr "井號(#)"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "新增操作(&E)..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "Begin-End (=begin  =end)"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "樣本"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ruby 代碼產生</p>"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "新增樣本(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "語言"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Enum 常數"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "資料夾"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "新增 Enum 常數(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "將全部產生的檔案儲存到資料夾："
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "實體屬性"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "瀏覽(&W)..."
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "新增實體屬性(&E)..."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "瀏覽(&R)..."
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "初始活動"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "引入資料夾中的標頭檔案："
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "終止活動"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "代碼產生器所產生的檔案將儲存到此資料夾"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "活動型態："
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr "此資料夾中的檔案將被用作產生代碼的標頭檔案"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "活動名稱："
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "覆寫策略"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "元件顏色"
+#: 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/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "屬性特性"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "覆寫(&V)"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "初始值(&I)："
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "如果檔案存在於目標資料夾內，則覆寫"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "公開（public）(&P)"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "詢問(&K)"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "所屬入的屬性名稱無效。"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "如果同名檔案已經存在，則詢問要怎麼辦"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "屬性名稱無效"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "使用不同的名稱(&U)"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "所選擇的屬性名稱已經在此操作中使用。"
+"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/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "屬性名稱不唯一"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "格式化"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "選擇操作"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "行"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "序號："
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "行尾風格："
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "類別操作："
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "縮排型態："
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "自訂操作："
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "縮排大小："
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "圖表(&D)"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX（\"\\n\"）"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "過濾器"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows（\"\\r\\n\"）"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "當前圖表(&C)"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac（\"\\r\"）"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "全部圖表(&A)"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "無縮排"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "選擇圖表(&S)"
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "圖表型態(&T)"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "空格"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "選取內容"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "註解細節"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "協作圖"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "即使該部分為空的，也要寫入註解(&F)"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "序列"
+#: 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/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "部署"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "即使該文件為空的，也要寫註解(&W)"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "沒有選擇圖表。"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "即使類別和方法的文件為空，也要寫註解"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "顯示選項"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "語言選項"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "屬性設定"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "代碼產生精靈"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "操作設定"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "選擇類別"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "樣本設定"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr "將所有需要產生代碼的類別放置在右邊的列表中"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Enum 常數設定"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "加入要產生代碼的類別"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "實體屬性設定"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "所選的類別"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "內容設定"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "刪除要產生代碼的類別"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "關聯"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "可用的類別"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "類別關聯"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "代碼產生狀態"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "操作(&N)"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "按下產生按鈕開始產生代碼"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "可見性(&V)"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "產生狀態"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "操作簽名(&P)"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "顯示隱藏區塊"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "套件(&K)"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">元件名稱</p>"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "屬性(&R)"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "模板造型(&Y)"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "顯示區塊型態"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "屬性簽名(&I)"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "顏色"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "繪製成圓"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "字型："
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "初始狀態"
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
+msgstr "紙張："
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "終止狀態"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "已選取："
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "狀態型態："
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML 物件區塊：</p>"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "狀態名稱："
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">隱藏區塊：</p>"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "元件顏色"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">唯讀文字：</p>"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "新類別"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">可編輯文字：</p>"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "新類別"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "圖表屬性"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "類別屬性"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "縮放："
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "類別操作"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "參數屬性"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "顯示格線(&G)"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "傳遞方向"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "貼齊格線(&T)"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "貼齊元件大小"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr "\"in\" 為唯讀參數，\"out\" 為唯寫參數，\"inout\" 為可讀寫參數。"
+"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 ""
+"貼齊元件的大小為格線間距的整數倍。\n"
+"如果開啟「貼齊格線」，那麼元件的四條邊將永遠與格線對齊。"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "產生(&G)"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "格線間距："
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "完成"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "代碼已產生"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "未產生"
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "線寬："
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "尚未產生"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, no-c-format
+msgid "Export all views"
+msgstr "匯出所有檢視"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "資料夾 %1 不存在。要現在建立嗎？"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr "儲存圖表的目錄(&D)："
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "輸出資料夾不存在"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr "用於儲存影像的基礎資料夾"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "建立資料夾"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, no-c-format
+msgid "&Image type:"
+msgstr "影像型態(&I)："
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "不要建立"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, no-c-format
+msgid "Use &folders"
+msgstr "使用資料夾(&F)"
 
-#: dialogs/codegenerationwizard.cpp:168
+#: dialogs/exportallviewsdialogbase.ui:103
+#, 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."
-msgstr ""
-"無法建立資料夾。\n"
-"請確定您對其父資料夾有寫入的權限，否則請另選一個可使用的資料夾。"
-
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "建立資料夾時發生錯誤"
-
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "請選擇一個有效的資料夾。"
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr "在目標資料夾建立文件內使用的相同的樹狀結構以儲存檢視。"
 
-#: dialogs/codegenerationwizard.cpp:184
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"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 ""
-"輸出資料夾已存在，但無法寫入。\n"
-"請設定正確的權限，或另選一個資料夾。"
+"檢視是保留在文件中的資料夾。您可以將文件中用於儲存檢視的樹狀結構也套用在此選"
+"項所選取的基礎資料夾中。\n"
+"只有使用者建立的資料夾會在基礎資料夾中建立（邏輯檢視、用例檢視等不會被建"
+"立）。"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "寫入輸出資料夾時發生錯誤"
-
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 不像是資料夾。請選擇一個有效的資料夾。"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "角色可變性"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "請選擇有效的資料夾"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "角色可見性"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "目標檔案已存在"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr "匯出(&E)"
 
-#: 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."
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
 msgstr ""
-"檔案 %1 已存在於 %2 中。\n"
-"\n"
-"Umbrello 可以覆蓋檔案、產生名稱相近的檔案或不產生此檔案。"
-
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "套用到剩下的所有檔案(&A)"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "覆蓋檔案(&O)"
-
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "產生名稱相近的檔案(&G)"
-
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "不要產生檔案(&D)"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">沒有可用的選項。</p>"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "多重性"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "輸入多重性："
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "關聯名稱"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "輸入關聯名稱："
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "角色名稱"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "輸入角色名稱："
-
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "輸入操作名稱："
-
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "輸入新文字："
-
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "錯誤"
-
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "更改文字"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "置左對齊"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "置右對齊"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "圖表(&D)"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "置頂對齊"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "新增(&N)"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "置底對齊"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "顯示(&O)"
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "Align Vertical Middle"
-msgstr "垂直置中對齊"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "縮放："
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "Align Horizontal Middle"
-msgstr "水平置中對齊"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "代碼(&C)"
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "Align Vertical Distribute"
-msgstr "垂直分散對齊"
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "啟動語言(&L)"
 
-#: aligntoolbar.cpp:47
+#: tips:3
 #, fuzzy
-msgid "Align Horizontal Distribute"
-msgstr "水平分散對齊"
-
-#: aligntoolbar.cpp:383
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr "要進行對齊，您必須至少選擇兩個像類別或主角這樣的物件。您不能對齊關聯。"
+"<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 ""
+"<p>歡迎使用 Umbrello。</p>\n"
+"<p>UML 圖表可幫助您設計物件導向軟體，並為您組織文件。<a href=\"help:/umbrello"
+"\">Umbrello 手冊</a> 中對 UML 的使用有很好的介紹。</p>\n"
 
-#: object_factory.cpp:164
+#: tips:11
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "這是配置的代碼產生器語言所用的保留關鍵字。"
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "保留的關鍵字"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "正在匯出檢視..."
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
+msgstr ""
+"<p>歡迎使用 Umbrello 1.5。此版本中的新增內容包括關聯類別、Ruby 代碼產生、外部"
+"化資料夾、將介面轉變為類別等等。</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:17
 msgid ""
-"An error happened when exporting the image:\n"
+"<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 ""
-"匯出影像時發生錯誤。\n"
+"<p>標籤式圖表和外部化資料夾無法同時使用。如果您需要外部資料夾，必須在一般設定"
+"中取消「使用標籤式圖表」。</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:23
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<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 ""
-"所選取的檔案 %1 已存在。\n"
-"您要覆寫它嗎？"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "檔案已存在"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "新主角"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "新用例"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "新套件"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "新元件"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "新節點"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "新產出"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "新介面"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "新資料型態"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "新 Enum"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "新實體"
-
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "新資料夾"
+"<p>大多數的圖表項目都不能手動改變大小，它們會自己改變以便適用於它們的內容。方"
+"框、註釋和序列圖信息可以改變大小，只需在紅色正方形上點擊和拖曳。</p>\n"
 
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "新物件"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "空"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "參數格式不對"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "未知的參數型態"
+#: 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 "<p>如果想新增一個已經存在的類別到圖表，從樹狀檢視中拖曳即可。</p>\n"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "不正確的方法名稱"
+#: 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 ""
+"<p>Umbrello 的重構代理讓您可以在類別和它的衍生或基礎類別間移動操作。在類別上"
+"點擊右鍵可以開啟重構代理。</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "未知的返回型態"
+#: 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 ""
+"<p>序列圖物件可以有一個解構子方框，並繪製成主角。雙擊可以開啟屬性對話框。</"
+"p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "未指定的錯誤"
+#: 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 ""
+"<p>序列圖訊息可以做為建構子。點擊物件方框（而不是垂直線）就可以讓它做為建構"
+"子。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "新增基礎類別"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
+msgstr ""
+"<p>序列圖支援給自己的訊息。再次點選同樣的垂直線條就可以建立一個自動訊息。</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "新增衍生類別"
+#: 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 ""
+"<p>如果載入外部檔案時在列表檢視中沒有顯示任何東西，請試著用不同名稱儲存模型，"
+"關閉再重新載入剛儲存的檔案。通常列表檢視就會正常了。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "新增操作"
+#: 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 ""
+"<p>剪下和複製會將影像以 PNG 格式儲存在剪貼簿中，在 KWord 或其它應用程式中可以"
+"直接貼上。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "新增屬性"
+#: 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 "<p>關聯不必一定是直線。雙擊其中一條，可以建立一個可移動的點。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "新增基礎介面"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr "<p>在 Umbrello 設定對話框中可以開啟自動儲存功能。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "新增衍生介面"
+#: 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 ""
+"<p>您需要 Umbrello 沒有提供的功能？請讓我們知道。\n"
+"可以使用說明選單的中的「報告問題」來增加希望清單，\n"
+"或發信到 uml-devel 郵件論壇。</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a></li>\n"
+"</ul>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "基礎分類器"
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr "<p>按刪除鍵或後退鍵來刪除全部選中的物件。</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "衍生分類器"
+#: 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 ""
+"<p>如果您發現了 Umbrello 的錯誤，請讓我們知道。\n"
+"您可以用說明選單裡的「報告問題」來回報。</p>\n"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "無法建立目錄：%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 ""
+"<p>按 ESC 鍵將所選的工具設定為目前使用的工具。按後退鍵跳至先前使用的工具。</"
+"p>\n"
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "無法儲存一個空的圖表"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>按 Ctrl-A 選擇所有物件。</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "在 %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 "<p>使用代碼選單中的新增類別精靈可以建立和設定一個新類別。</p>\n"
 
 #~ msgid "new_stereotype"
 #~ msgstr "新模板造型"